diff --git a/src/roster_window.py b/src/roster_window.py
index 6673b1bf7..23055b0b0 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -495,15 +495,16 @@ class RosterWindow:
 		if self.regroup:
 			add_acct = False
 			# look through all contacts of all accounts
-			for a in gajim.connections:
-				if a == account: # useless to add accout name
+			for account_iter in gajim.connections:
+				if account_iter == account: # useless to add accout name
 					continue
-				for j in gajim.contacts.get_jid_list(a):
+				for jid_iter in gajim.contacts.get_jid_list(account_iter):
 					# [0] cause it'fster than highest_prio
-					c = gajim.contacts.get_first_contact_from_jid(a, j)
-					if c.get_shown_name() == \
+					contact_iter = gajim.contacts.\
+						get_first_contact_from_jid(account_iter, jid_iter)
+					if contact_iter.get_shown_name() == \
 					contact.get_shown_name() and\
-					(j, a) != (jid, account):
+					(jid_iter, account_iter) != (jid, account):
 						add_acct = True
 						break
 				if add_acct:
diff --git a/src/tooltips.py b/src/tooltips.py
index bfacf7c8c..574e94249 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -254,7 +254,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 			# there are possible pango TBs on 'set_markup'
 			if isinstance(message, str):
 				message = unicode(message, encoding = 'utf-8')
-			message = gtkgui_helpers.reduce_chars_newlines(message, 50, 1)
+			message = gtkgui_helpers.reduce_chars_newlines(message, 100, 1)
 			message = gtkgui_helpers.escape_for_pango_markup(message)
 			if gajim.con_types.has_key(acct['name']) and \
 				gajim.con_types[acct['name']] in ('tls', 'ssl'):
@@ -329,7 +329,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 
 		elif len(accounts) == 1:
 			message = accounts[0]['status_line']
-			message = gtkgui_helpers.reduce_chars_newlines(message, 50, 1)
+			message = gtkgui_helpers.reduce_chars_newlines(message, 100, 1)
 			message = gtkgui_helpers.escape_for_pango_markup(message)
 			text = _('Gajim - %s') % message
 		else: