diff --git a/src/client/views/conversation-viewer.vala b/src/client/views/conversation-viewer.vala
index 346fef6..4d90a3a 100644
--- a/src/client/views/conversation-viewer.vala
+++ b/src/client/views/conversation-viewer.vala
@@ -576,6 +576,10 @@ public class ConversationViewer : Gtk.Box {
         out bool remote_images) {
         string header = "";
         WebKit.DOM.HTMLElement div_email_container = Util.DOM.select(div_message, "div.email_container");
+        WebKit.DOM.HTMLElement div_header_container = Util.DOM.select(div_message, "div.header_container");
+        
+        if (Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL)
+            div_header_container.dir = "rtl";
         
         insert_header_address(ref header, _("From:"), message.from, true);
         
