diff --git a/core/core.py b/core/core.py
index 20a4e8aeb..c774a7ab2 100644
--- a/core/core.py
+++ b/core/core.py
@@ -631,6 +631,9 @@ class GajimCore:
 			#('STATUS', account, (status, msg))
 			elif ev[0] == 'STATUS':
 				activ = 1
+				msg = ev[2][1]
+				if not msg:
+					msg = ev[2][0]
 				signed = ''
 				keyID = ''
 				if self.cfgParser.tab[ev[1]].has_key("keyid"):
@@ -657,7 +660,7 @@ class GajimCore:
 						prio = 0
 						if self.cfgParser.tab[ev[1]].has_key('priority'):
 							prio = str(self.cfgParser.tab[ev[1]]['priority'])
-						con.sendPresence(typ, prio, ev[2][0], ev[2][1], signed)
+						con.sendPresence(typ, prio, ev[2][0], msg, signed)
 						self.hub.sendPlugin('STATUS', ev[1], ev[2][0])
 						#ask our VCard
 						iq = common.jabber.Iq(type="get")
@@ -680,7 +683,7 @@ class GajimCore:
 					prio = 0
 					if self.cfgParser.tab[ev[1]].has_key('priority'):
 						prio = str(self.cfgParser.tab[ev[1]]['priority'])
-					con.sendPresence(typ, prio, ev[2][0], ev[2][1], signed)
+					con.sendPresence(typ, prio, ev[2][0], msg, signed)
 					self.hub.sendPlugin('STATUS', ev[1], ev[2][0])
 			#('MSG', account, (jid, msg, keyID))
 			elif ev[0] == 'MSG':
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 3390f6015..276904205 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -2317,7 +2317,7 @@ class plugin:
 			if state == common.sleepy.STATE_AWAKE and \
 				self.sleeper_state[account] > 1:
 				#we go online
-				self.send('STATUS', account, ('online', ''))
+				self.send('STATUS', account, ('online', 'Online'))
 				self.sleeper_state[account] = 1
 			elif state == common.sleepy.STATE_AWAY and \
 				self.sleeper_state[account] == 1 and \