diff --git a/background.html b/background.html
index 83d5740a7..fefcfdf1c 100644
--- a/background.html
+++ b/background.html
@@ -280,9 +280,9 @@
           <div class='inner-bubble {{ innerBubbleClasses }}'>
             <div class='quote-wrapper'></div>
             <div class='attachments'></div>
-            <p class='content' dir='auto'>
+            <div class='content' dir='auto'>
               {{ #message }}<div class='body'>{{ message }}</div>{{ /message }}
-            </p>
+            </div>
           </div>
           <div class='meta'>
             <span class='timestamp' data-timestamp={{ timestamp }}></span>
diff --git a/test/index.html b/test/index.html
index 3a5aef198..ea75d74ff 100644
--- a/test/index.html
+++ b/test/index.html
@@ -215,9 +215,9 @@
           <div class='inner-bubble {{ innerBubbleClasses }}'>
             <div class='quote-wrapper'></div>
             <div class='attachments'></div>
-            <p class='content' dir='auto'>
+            <div class='content' dir='auto'>
               {{ #message }}<div class='body'>{{ message }}</div>{{ /message }}
-            </p>
+            </div>
           </div>
           <div class='meta'>
             <span class='timestamp' data-timestamp={{ timestamp }}></span>
diff --git a/test/styleguide/legacy_templates.js b/test/styleguide/legacy_templates.js
index 4c7f7e14d..278328c42 100644
--- a/test/styleguide/legacy_templates.js
+++ b/test/styleguide/legacy_templates.js
@@ -35,9 +35,9 @@ window.Whisper.View.Templates = {
         <div class='inner-bubble {{ innerBubbleClasses }}'>
           <div class='quote-wrapper'></div>
           <div class='attachments'></div>
-          <p class='content' dir='auto'>
+          <div class='content' dir='auto'>
             {{ #message }}<div class='body'>{{ message }}</div>{{ /message }}
-          </p>
+          </div>
         </div>
         <div class='meta'>
           <span class='timestamp' data-timestamp={{ timestamp }}></span>