diff --git a/src/roster_window.py b/src/roster_window.py
index 54386ef07..4248344e5 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1416,7 +1416,8 @@ _('If "%s" accepts this request you will know his status.') %jid)
 		one_connected = helpers.one_account_connected()
 		if active == 7: # We choose change status message (7 is that)
 			# do not change show, just show change status dialog
-			dlg = dialogs.ChangeStatusMessageDialog()
+			status = model[self.previous_status_combobox_active][2].decode('utf-8')
+			dlg = dialogs.ChangeStatusMessageDialog(status)
 			message = dlg.run()
 			if message is not None: # None if user pressed Cancel
 				for acct in accounts:
diff --git a/src/systray.py b/src/systray.py
index b461e3f4a..386e7c513 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -350,7 +350,9 @@ class Systray:
 		gajim.interface.roster.status_combobox.set_active(index)
 
 	def on_change_status_message_activate(self, widget):
-		dlg = dialogs.ChangeStatusMessageDialog()
+		model = gajim.interface.status_combobox.get_model()
+		status = model[active][2].decode('utf-8')
+		dlg = dialogs.ChangeStatusMessageDialog(status)
 		message = dlg.run()
 		if message is not None: # None if user press Cancel
 			accounts = gajim.connections.keys()