really nothing [ok.. a comment]

src/common/i18n.py

 ##	common/i18n.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@lagaule.org>
-## 	- Vincent Hanquez <tab@snarc.org>
+##  - Yann Le Boulanger <asterix@lagaule.org>
+##  - Vincent Hanquez <tab@snarc.org>
+##  - Nikos Kouremenos <kourem@gmail.com>
 ##
 ##	Copyright (C) 2003-2005 Gajim Team
 ##
@@ -19,7 +20,8 @@
 APP='gajim'
 DIR='../po'
 
-import locale, gettext
+import locale
+import gettext
 
 locale.setlocale(locale.LC_ALL, '')
 _translation = None

src/tabbed_chat_window.py

@@ -300,6 +300,7 @@ def print_conversation(self, text, jid, contact = '', tim = None,
 		chat.Chat.print_conversation_line(self, text, jid, kind, name, tim)
 
 	def restore_conversation(self, jid):
+		# don't restore lines if it's a transport
 		is_transport = jid.startswith('aim.') or jid.startswith('gadugadu.') or\
 			jid.startswith('irc.') or jid.startswith('icq.') or\
 			jid.startswith('msn.') or jid.startswith('sms.') or\