diff --git a/src/common/connection.py b/src/common/connection.py
index f41ec13f8..787f2826f 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1003,11 +1003,9 @@ class Connection:
 				# We didn't set a passphrase
 				self.dispatch('ERROR', (_('OpenPGP Key was not given'),
 					_('You will be connected to %s without OpenPGP.') % self.name))
-			else:
+			if self.connected >= 2
 				if not msg:
 					lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-					# FIXME: so, I will have an empty message, not: "I'm online",
-					# because I have a gpg
 					msg = _("I'm %s") % lowered_uf_status_msg
 				signed = self.gpg.sign(msg, keyID)
 				if signed == 'BAD_PASSPHRASE':
diff --git a/src/dialogs.py b/src/dialogs.py
index 67032e9dc..3a2bf99af 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -623,7 +623,9 @@ class StatusTable:
 		if status:
 			status = status.strip()
 			if status != '':
-				status = self.strip_text(status, 50)
+				if gtk.gtk_version < (2, 6, 0) or gtk.pygtk_version < (2, 6, 0):
+					# FIXME: check and do the same if we have more than one \n 
+					status = self.strip_text(status, 50)
 				str_status += ' - ' + status
 		return gtkgui_helpers.escape_for_pango_markup(str_status)
 	
@@ -1628,7 +1630,7 @@ class FileTransfersWindow:
 		file_props = self.files_props[sid[0]][sid[1:]]
 		if self.is_transfer_paused(file_props):
 			file_props['paused'] = False
-			types = {'r':'download', 's':'upload'}
+			types = {'r' : 'download', 's' : 'upload'}
 			self.set_status(file_props['type'], file_props['sid'], types[sid[0]])
 			widget.set_label(_('Pause'))
 		elif self.is_transfer_active(file_props):