diff --git a/src/common/config.py b/src/common/config.py
index 8aaf2b4c3..b0ccb9523 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -50,7 +50,7 @@ class Config:
 		'autoxatime': [ opt_int, 20 ],
 		'ask_online_status': [ opt_bool, False ],
 		'ask_offline_status': [ opt_bool, False ],
-		'last_msg': [ opt_str, '' ],
+		'last_status_msg': [ opt_str, '' ],
 		'trayicon': [ opt_bool, True ],
 		'iconset': [ opt_str, 'sun' ],
 		'inmsgcolor': [ opt_color, '#ff0000' ],
@@ -92,7 +92,7 @@ class Config:
 		'usegpg': [ opt_bool, False ],
 		'log_notif_in_user_file': [ opt_bool, True ],
 		'log_notif_in_sep_file': [ opt_bool, True ],
-		'change_title': [ opt_bool, True ],
+		'change_roster_title': [ opt_bool, True ],
 		'version': [ None, '0.7' ],
 	}
 
diff --git a/src/dialogs.py b/src/dialogs.py
index e37ecae38..7db66fd65 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -184,7 +184,7 @@ class Change_status_message_dialog:
 		
 		message_textview = self.xml.get_widget('message_textview')
 		self.message_buffer = message_textview.get_buffer()
-		self.message_buffer.set_text(gajim.config.get('last_msg'))
+		self.message_buffer.set_text(gajim.config.get('last_status_msg'))
 		self.values = {'':''}
 		for msg in gajim.config.get_per('statusmsg'):
 			self.values[msg] = gajim.config.get_per('statusmsg', msg, 'message')
@@ -203,7 +203,8 @@ class Change_status_message_dialog:
 		if rep == gtk.RESPONSE_OK:
 			beg, end = self.message_buffer.get_bounds()
 			message = self.message_buffer.get_text(beg, end, 0)
-			gajim.config.set('last_msg', message)
+			#FIXME: support more than one line
+			gajim.config.set('last_status_msg', message)
 		else:
 			message = -1
 		self.window.destroy()
diff --git a/src/roster_window.py b/src/roster_window.py
index 0305c77f0..879304238 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1386,7 +1386,7 @@ class Roster_window:
 		return
 
 	def show_title(self):
-		change_title_allowed = gajim.config.get('change_title')
+		change_title_allowed = gajim.config.get('change_roster_title')
 		if change_title_allowed:
 			start = ''
 			if self.nb_unread > 1:
@@ -1403,7 +1403,7 @@ class Roster_window:
 		elif status == 'xa':
 			uf_status = 'Not Available'
 		elif status == 'chat':
-			uf_status = 'Free or Chat'
+			uf_status = 'Free for Chat'
 		else:
 			uf_status = status.capitalize()
 		return uf_status