diff --git a/src/common/optparser.py b/src/common/optparser.py
index 95ff174e5..22bdc6159 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -47,7 +47,7 @@ class OptionsParser:
 			fd = open(self.__filename)
 		except:
 			if os.path.exists(self.__filename):
-				#it is file about file FIXME: bad comment
+				#we talk about a file
 				print _('error: cannot open %s for reading') % self.__filename
 			return
 
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 6ccc3697a..f77ef3926 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -122,8 +122,8 @@ class GroupchatWindow(chat.Chat):
 		for room_jid in self.xmls:
 			if time.time() - gajim.last_message_time[self.account][room_jid] < 2:
 				dialog = dialogs.ConfirmationDialog(
-		_('You just received a new message in room "%s"') %room_jid.split('@')[0],
-			_('If you close this window, this message will be lost.')
+	_('You just received a new message in room "%s"') % room_jid.split('@')[0],
+	_('If you close this window and you have history disabled, this message will be lost.')
 					)
 				if dialog.get_response() != gtk.RESPONSE_OK:
 					dialog.destroy()
@@ -967,7 +967,7 @@ class GroupchatWindow(chat.Chat):
 			name = gajim.get_nick_from_jid(room_jid)
 			dialog = dialogs.ConfirmationDialog(
 				_('You just received a new message in room "%s"') % name,
-				_('If you close this tab, the message will be lost.'))
+		_('If you close this tab and you have history disabled, the message will be lost.'))
 			if dialog.get_response() != gtk.RESPONSE_OK:
 				return
 
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index fa15c7de9..cfd54cc62 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -272,7 +272,7 @@ timestamp, contact):
 				dialog = dialogs.ConfirmationDialog(
 					#%s is being replaced in the code with JID
 					_('You just received a new message from "%s"' % jid),
-					_('If you close the window, this message will be lost.'))
+					_('If you close this tab and you have history disabled, this message will be lost.'))
 				if dialog.get_response() != gtk.RESPONSE_OK:
 					return True #stop the propagation of the event
 
@@ -340,7 +340,7 @@ timestamp, contact):
 		if time.time() - gajim.last_message_time[self.account][jid] < 2:
 			dialog = dialogs.ConfirmationDialog(
 				_('You just received a new message from "%s"' % jid),
-				_('If you close this tab, the message will be lost.'))
+				_('If you close this tab and you have history disabled, the message will be lost.'))
 			if dialog.get_response() != gtk.RESPONSE_OK:
 				return