diff --git a/src/common/i18n.py b/src/common/i18n.py
index fa82917314cdf0890383ccaa30cba016829a68f2..c85b7da080d8b1b48bf62ae9d23e21e081d54825 100644
--- a/src/common/i18n.py
+++ b/src/common/i18n.py
@@ -28,7 +28,7 @@ import defs
 import unicodedata
 
 # May be changed after GTK is imported
-direction_mark = u'\u200F'
+direction_mark = u'\u200E'
 
 def paragraph_direction_mark(text):
     """
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 238b853c2c32619d60ec3d914461c49427ee2c41..035b14ddd6794e308420af845e004368e3fa55a6 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -236,7 +236,8 @@ class PrivateChatControl(ChatControl):
                     _('Sending private message failed'),
                     #in second %s code replaces with nickname
                     _('You are no longer in group chat "%(room)s" or '
-                    '"%(nick)s" has left.') % {'room': room, 'nick': nick})
+                    '"%(nick)s" has left.') % {'room': u'\u200E' + room,
+                    'nick': nick})
                 return
 
         ChatControl.send_message(self, message, xhtml=xhtml,
@@ -780,7 +781,7 @@ class GroupchatControl(ChatControlBase):
             name = self.get_continued_conversation_name()
         else:
             name = self.room_jid
-        text = '<span %s>%s</span>' % (font_attrs, name)
+        text = '<span %s>%s</span>' % (font_attrs, u'\u200E' + name)
         self.name_label.set_markup(text)
 
         if self.subject:
@@ -2189,9 +2190,9 @@ class GroupchatControl(ChatControlBase):
                 reason, jid)
 
         # Ask for a reason
-        dialogs.DoubleInputDialog(_('Destroying %s') % self.room_jid,
-            _('You are going to definitively destroy this room.\n'
-            'You may specify a reason below:'),
+        dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \
+            self.room_jid, _('You are going to definitively destroy this \
+            room.\nYou may specify a reason below:'),
             _('You may also enter an alternate venue:'), ok_handler=on_ok)
 
     def _on_bookmark_room_menuitem_activate(self, widget):