diff --git a/src/gajim.py b/src/gajim.py
index 487bd3ddb..ec5354d3e 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -2782,8 +2782,9 @@ class Interface:
 				self.roster.send_status(a,
 					gajim.config.get_per('accounts', a, 
 					'last_status'),
+					helpers.from_one_line(
 					gajim.config.get_per('accounts', a,
-					'last_status_msg'))
+					'last_status_msg')))
 		return False
 
 	def show_systray(self):
diff --git a/src/roster_window.py b/src/roster_window.py
index cf469122a..a696b312b 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1893,7 +1893,8 @@ class RosterWindow:
 				gajim.config.set_per('accounts', account,
 					'last_status', status)
 				gajim.config.set_per('accounts', account,
-					'last_status_msg', txt)
+					'last_status_msg',
+					helpers.to_one_line(txt))
 			if gajim.connections[account].connected < 2:
 				self.set_connecting_state(account)