diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index f195fe972..c4b53a292 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -455,7 +455,7 @@ class add_contact_window:
 class About_dialog:
 	"""Class for about dialog"""
 	def __init__(self, plugin):
-		if gtk.pygtk_version >= (2, 6, 0):
+		if gtk.pygtk_version < (2, 6, 0):
 			return
 		self.plugin = plugin
 		#xml.get_widget('logo_image').set_from_file('plugins/gtkgui/pixmaps/logo.png')
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 090c815cd..ae84823ec 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -8978,7 +8978,7 @@ send a chat message to</property>
   </child>
 </widget>
 
-<widget class="GtkMenu" id="menu1">
+<widget class="GtkMenu" id="systray_context_menu">
 
   <child>
     <widget class="GtkMenuItem" id="status_menu">
@@ -8990,62 +8990,105 @@ send a chat message to</property>
 	<widget class="GtkMenu" id="status_menu_menu">
 
 	  <child>
-	    <widget class="GtkMenuItem" id="online1">
+	    <widget class="GtkMenuItem" id="online_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Online</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_online_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="away1">
+	    <widget class="GtkMenuItem" id="away_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Away</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_away_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="xa1">
+	    <widget class="GtkMenuItem" id="xa_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">XA</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_xa_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="dnd1">
+	    <widget class="GtkMenuItem" id="dnd_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">DND</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_dnd_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="invisible1">
+	    <widget class="GtkMenuItem" id="invisible_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Invisible</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_invisible_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="offline1">
+	    <widget class="GtkMenuItem" id="offline_menuitem">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Offline</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="set_cb" last_modification_time="Mon, 14 Mar 2005 16:14:43 GMT"/>
+	      <signal name="activate" handler="on_offline_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
 	    </widget>
 	  </child>
 	</widget>
       </child>
     </widget>
   </child>
+
+  <child>
+    <widget class="GtkMenuItem" id="chat_with_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Chat with</property>
+      <property name="use_underline">True</property>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="new_message_menuitem">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">New message</property>
+      <property name="use_underline">True</property>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image472">
+	  <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="GtkSeparatorMenuItem" id="separator">
+      <property name="visible">True</property>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="quit_menuitem">
+      <property name="visible">True</property>
+      <property name="label">gtk-quit</property>
+      <property name="use_stock">True</property>
+      <signal name="activate" handler="on_quit_menuitem_activate" last_modification_time="Tue, 15 Mar 2005 00:15:28 GMT"/>
+    </widget>
+  </child>
 </widget>
 
 </glade-interface>
diff --git a/plugins/gtkgui/systray.py b/plugins/gtkgui/systray.py
index 89650260a..6d16b0ad7 100644
--- a/plugins/gtkgui/systray.py
+++ b/plugins/gtkgui/systray.py
@@ -75,10 +75,6 @@ class systray:
 		self.status = status
 		self.set_img()
 
-	def set_cb(self, widget, status):
-		statuss = ['online', 'away', 'xa', 'dnd', 'invisible', 'offline']
-		self.plugin.roster.cb.set_active(statuss.index(status))
-
 	def start_chat(self, widget, account, jid):
 		if self.plugin.windows[account]['chats'].has_key(jid):
 			self.plugin.windows[account]['chats'][jid].window.present()
@@ -93,37 +89,11 @@ class systray:
 
 	def make_menu(self, event):
 		"""create chat with and new message (sub) menus/menuitems"""
-		menu = gtk.Menu()
 		
-		item = gtk.MenuItem(_("Status"))
-		menu.append(item)
-		sub_menu = gtk.Menu()
-		item.set_submenu(sub_menu)
-		item = gtk.MenuItem(_("Online"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'online')
-		item = gtk.MenuItem(_("Away"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'away')
-		item = gtk.MenuItem(_("NA"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'xa')
-		item = gtk.MenuItem(_("DND"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'dnd')
-		item = gtk.MenuItem(_("Invisible"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'invisible')
-		item = gtk.MenuItem()
-		sub_menu.append(item)
-		item = gtk.MenuItem(_("Offline"))
-		sub_menu.append(item)
-		item.connect("activate", self.set_cb, 'offline')
-
-		chat_with_menuitem = gtk.MenuItem(_('Chat with'))
-		menu.append(chat_with_menuitem)
-		new_message_menuitem = gtk.MenuItem(_('New Message'))
-		menu.append(new_message_menuitem)
+		chat_with_menuitem = self.xml.get_widget('chat_with_menuitem')
+		#menu.append(chat_with_menuitem)
+		new_message_menuitem = self.xml.get_widget('new_message_menuitem')
+		#menu.append(new_message_menuitem)
 		
 		if len(self.plugin.accounts.keys()) > 0:
 			chat_with_menuitem.set_sensitive(True)
@@ -163,17 +133,13 @@ class systray:
 			self.new_message_handler_id = new_message_menuitem.connect(\
 				'activate', self.on_new_message_menuitem_activate, account)
 
-		item = gtk.MenuItem() # seperator
-		menu.append(item)
-		
-		item = gtk.MenuItem(_('Quit'))
-		menu.append(item)
-		item.connect('activate', self.plugin.roster.on_quit_menuitem_activate)
-		
-		menu.popup(None, None, None, event.button, event.time)
-		menu.show_all()
-		menu.reposition()
+		self.systray_context_menu.popup(None, None, None, event.button, event.time)
+		self.systray_context_menu.show_all()
+		self.systray_context_menu.reposition()
 	
+	def on_quit_menuitem_activate(self, widget):	
+		self.plugin.roster.on_quit_menuitem_activate(widget)
+
 	def make_groups_submenus_for_chat_with(self, account):
 		groups_menu = gtk.Menu()
 		
@@ -230,6 +196,24 @@ class systray:
 						self.plugin.roster.contacts[account][jid][0], account)
 		if event.button == 3:
 			self.make_menu(event)
+	
+	def on_online_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(0) # 0 is online
+	
+	def on_away_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(1) # 1 is away
+	
+	def on_xa_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(2) # 2 is xa
+
+	def on_away_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(3) # 3 is dnd
+
+	def on_away_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(4) # 4 is invisible
+		
+	def on_away_menuitem_activate(self, widget):
+		self.plugin.roster.cb.set_active(5) # 5 is offline
 
 	def show_icon(self):
 		if not self.t:
@@ -255,6 +239,9 @@ class systray:
 		self.t = None
 		self.img_tray = gtk.Image()
 		self.status = 'offline'
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'systray_context_menu', APP)
+		self.systray_context_menu = self.xml.get_widget('systray_context_menu')
+		self.xml.signal_autoconnect(self)
 		global trayicon
 		try:
 			import egg.trayicon as trayicon	# gnomepythonextras trayicon