diff --git a/data/glade/zeroconf_context_menu.glade b/data/glade/zeroconf_context_menu.glade
index b6bf84d43..f2928cf04 100644
--- a/data/glade/zeroconf_context_menu.glade
+++ b/data/glade/zeroconf_context_menu.glade
@@ -12,7 +12,7 @@
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1256">
+	<widget class="GtkImage" id="image1258">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-network</property>
 	  <property name="icon_size">1</property>
@@ -25,26 +25,6 @@
     </widget>
   </child>
 
-  <child>
-    <widget class="GtkImageMenuItem" id="new_message_menuitem">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">Send Single _Message...</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image1257">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-new</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
   <child>
     <widget class="GtkImageMenuItem" id="zeroconf_properties_menuitem">
       <property name="visible">True</property>
@@ -52,7 +32,7 @@
       <property name="use_underline">True</property>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1258">
+	<widget class="GtkImage" id="image1259">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-preferences</property>
 	  <property name="icon_size">1</property>
diff --git a/data/glade/zeroconf_properties_window.glade b/data/glade/zeroconf_properties_window.glade
index 0c2b30490..e8f596a63 100644
--- a/data/glade/zeroconf_properties_window.glade
+++ b/data/glade/zeroconf_properties_window.glade
@@ -5,7 +5,7 @@
 
 <widget class="GtkWindow" id="zeroconf_properties_window">
   <property name="border_width">12</property>
-  <property name="title" translatable="yes">Zeroconf Properties</property>
+  <property name="title" translatable="yes">Modify Account</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
diff --git a/src/roster_window.py b/src/roster_window.py
index 96f78cab6..14a1c9ff4 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2031,14 +2031,14 @@ class RosterWindow:
 			#gc_sub_menu = gtk.Menu() # gc is always a submenu
 			#join_group_chat_menuitem.set_submenu(gc_sub_menu)
 			#self.add_bookmarks_list(gc_sub_menu, account)
-			new_message_menuitem.connect('activate',
-				self.on_new_message_menuitem_activate, account)
+			#new_message_menuitem.connect('activate',
+			#	self.on_new_message_menuitem_activate, account)
 
 			# make some items insensitive if account is offline
-			if gajim.connections[account].connected < 2:
+			#if gajim.connections[account].connected < 2:
 			#	for widget in [join_group_chat_menuitem, new_message_menuitem]:
 			#		widget.set_sensitive(False)
-				new_message_menuitem.set_sensitive(False)
+			#	new_message_menuitem.set_sensitive(False)
 					
 		return account_context_menu