diff --git a/src/systraywin32.py b/src/systraywin32.py
index 146c4bd59..be5271b3d 100644
--- a/src/systraywin32.py
+++ b/src/systraywin32.py
@@ -286,12 +286,11 @@ class SystrayWin32(systray.Systray):
 					if jid != 'tabbed':
 						nb += self.plugin.windows[acct][kind][jid].nb_unread[jid]
 		
-		#FIXME: prepare me for transltaion (ngeetext() and all) for 0.9
 		if nb > 0:
 			text = i18n.ngettext(
-					'Gajim - one unread message',
+					'Gajim - %d unread message',
 					'Gajim - %d unread messages',
-					nb, None, nb)
+					nb, nb, nb)
 		else:
 			text = 'Gajim'
 		self.systray_winapi.notify_icon.set_tooltip(text)
diff --git a/src/tooltips.py b/src/tooltips.py
index 70856858e..1990eecdf 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -209,9 +209,9 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
 
 		if unread_messages_no > 0:
 			text = i18n.ngettext(
-					'Gajim - one unread message',
+					'Gajim - %d unread message',
 					'Gajim - %d unread messages',
-					unread_messages_no, None, unread_messages_no)
+					unread_messages_no, unread_messages_no, unread_messages_no)
 		elif len(accounts) > 1:
 			text = _('Gajim')
 			self.current_row = 1