diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb
index 569a12e0582..3a56269ae26 100644
--- a/app/views/email/_post.html.erb
+++ b/app/views/email/_post.html.erb
@@ -1,31 +1,23 @@
-<table class='post-wrapper <%= post.whisper? ? "whisper" : "" %> <%= use_excerpt ? "excerpt" : ""%>'>
-  <tbody>
+<div class='post-wrapper <%= post.whisper? ? "whisper" : "" %> <%= use_excerpt ? "excerpt" : ""%>'>
+  <table>
     <tr>
+      <td class='user-avatar'>
+        <img src="<%= post.user.small_avatar_url %>" title="<%= post.user.username%>">
+      </td>
       <td>
-        <table>
-          <tr>
-            <td class='user-avatar'>
-              <img src="<%= post.user.small_avatar_url %>" title="<%= post.user.username%>">
-            </td>
-            <td>
-              <%- if show_username_on_post(post) %>
-              <a class="username" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.username %></a>
-              <% end %>
-              <%- if show_name_on_post(post) %>
-                <a class="user-name" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.name %></a>
-              <% end %>
-              <%- if post.user.title.present? %>
-                <span class='user-title'><%= post.user.title %></span>
-              <% end %>
-              <br>
-              <span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
-            </td>
-          </tr>
-        </table>
+        <%- if show_username_on_post(post) %>
+        <a class="username" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.username %></a>
+        <% end %>
+        <%- if show_name_on_post(post) %>
+          <a class="user-name" href="<%=Discourse.base_url%>/u/<%= post.user.username_lower%>" target="_blank"><%= post.user.name %></a>
+        <% end %>
+        <%- if post.user.title.present? %>
+          <span class='user-title'><%= post.user.title %></span>
+        <% end %>
+        <br>
+        <span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
       </td>
     </tr>
-    <tr>
-      <td class='body'><%= format_for_email(post, use_excerpt) %></td>
-    </tr>
-  </tbody>
-</table>
+  </table>
+  <div class='body'><%= format_for_email(post, use_excerpt) %></div>
+</div>
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 9dd34e5da49..eb3074f5b87 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -92,8 +92,8 @@ module Email
       style('.user-avatar img', nil, width: '45', height: '45')
       style('hr', 'background-color: #ddd; height: 1px; border: 1px;')
       style('.rtl', 'direction: rtl;')
-      style('td.body', 'padding-top:5px;', colspan: "2")
-      style('.whisper td.body', 'font-style: italic; color: #9c9c9c;')
+      style('div.body', 'padding-top:5px;')
+      style('.whisper div.body', 'font-style: italic; color: #9c9c9c;')
       style('.lightbox-wrapper .meta', 'display: none')
       correct_first_body_margin
       correct_footer_style