diff --git a/data/glade/gc_control_popup_menu.glade b/data/glade/gc_control_popup_menu.glade
index f66d780f3445532b2d0a99abad1bdd0c2580895c..777c457330be1cdf67584454c1ca0eef786bb0c1 100644
--- a/data/glade/gc_control_popup_menu.glade
+++ b/data/glade/gc_control_popup_menu.glade
@@ -109,27 +109,32 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="history_menuitem">
-        <property name="tooltip" translatable="yes">Click to see past conversation in this room</property>
-        <property name="label" translatable="yes">_History</property>
+      <widget class="GtkImageMenuItem" id="bookmark_room_menuitem">
+        <property name="label" translatable="yes">_Bookmark</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1405">
+          <widget class="GtkImage" id="image1410">
             <property name="visible">True</property>
-            <property name="stock">gtk-justify-fill</property>
+            <property name="stock">gtk-add</property>
             <property name="icon_size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="bookmark_room_menuitem">
-        <property name="label" translatable="yes">_Bookmark</property>
+      <widget class="GtkSeparatorMenuItem" id="seperator">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="history_menuitem">
+        <property name="tooltip" translatable="yes">Click to see past conversation in this room</property>
+        <property name="label" translatable="yes">_History</property>
         <property name="use_underline">True</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1410">
+          <widget class="GtkImage" id="image1405">
             <property name="visible">True</property>
-            <property name="stock">gtk-add</property>
+            <property name="stock">gtk-justify-fill</property>
             <property name="icon_size">1</property>
           </widget>
         </child>
diff --git a/data/glade/gc_occupants_menu.glade b/data/glade/gc_occupants_menu.glade
index 77b47bfc98c6e292b903d737a0bb964cbb789b67..c78fbd8e61836eba07fc9472508b1020e6ae9484 100644
--- a/data/glade/gc_occupants_menu.glade
+++ b/data/glade/gc_occupants_menu.glade
@@ -92,6 +92,25 @@
         <property name="visible">True</property>
       </widget>
     </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Add to Roster</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image1052">
+            <property name="visible">True</property>
+            <property name="stock">gtk-add</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator6">
+        <property name="visible">True</property>
+      </widget>
+    </child>
     <child>
       <widget class="GtkImageMenuItem" id="information_menuitem">
         <property name="visible">True</property>
@@ -114,19 +133,5 @@
         </child>
       </widget>
     </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Add to Roster</property>
-        <property name="use_underline">True</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image1052">
-            <property name="visible">True</property>
-            <property name="stock">gtk-add</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
   </widget>
 </glade-interface>