diff --git a/src/config.py b/src/config.py
index 7d9a09e18..95b719a1e 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2292,7 +2292,6 @@ class ManageBookmarksWindow:
 						bookmark['password'],
 						bookmark['nick'] ])
 
-
 		self.view = self.xml.get_widget('bookmarks_treeview')
 		self.view.set_model(self.treestore)
 		self.view.expand_all()
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 538d7963e..e94755ac8 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -1545,9 +1545,9 @@
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
 	</packing>
-     </child>
+      </child>
 
-     <child>
+      <child>
 	<widget class="GtkTable" id="table21">
 	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
@@ -8202,8 +8202,7 @@ Custom</property>
 		  <child>
 		    <widget class="GtkLabel" id="banner_name_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;heavy&quot; size=&quot;large&quot;&gt;Room: name@jabber.org&lt;/span&gt;
-This is the subject.</property>
+		      <property name="label" translatable="yes"></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8217,7 +8216,7 @@ This is the subject.</property>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
+		  <property name="padding">4</property>
 		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
@@ -13695,7 +13694,7 @@ the Jabber network.</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
+		  <property name="visibility">False</property>
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
diff --git a/src/roster_window.py b/src/roster_window.py
index 93399a43c..fa87582e7 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -265,11 +265,11 @@ class RosterWindow:
 			self.add_new_contact_handler_id = None
 		if self.service_disco_handler_id:
 			service_disco_menuitem.handler_disconnect(
-					self.service_disco_handler_id)
+				self.service_disco_handler_id)
 			self.service_disco_handler_id = None
 		if self.new_message_menuitem_handler_id:
 			new_message_menuitem.handler_disconnect(
-					self.new_message_menuitem_handler_id)
+				self.new_message_menuitem_handler_id)
 			self.new_message_menuitem_handler_id = None
 		#remove the existing submenus
 		add_new_contact_menuitem.remove_submenu()