Merge "disable floaty footer" into ub-mail-master
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index b530b8e..6dc34fe 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java
@@ -127,10 +127,14 @@
      *
      */
     public static String wrapMessageBody(String msgBody) {
-        final StringBuilder sb = new StringBuilder("<div style=\"display: table-cell;\">");
-        sb.append(msgBody);
-        sb.append("</div>");
-        return sb.toString();
+        // FIXME: this breaks RTL for an as-yet undetermined reason. b/13678928
+        // no-op for now.
+        return msgBody;
+
+//        final StringBuilder sb = new StringBuilder("<div style=\"display: table-cell;\">");
+//        sb.append(msgBody);
+//        sb.append("</div>");
+//        return sb.toString();
     }
 
     public void appendMessageHtml(HtmlMessage message, boolean isExpanded,