diff --git a/src/tooltips.py b/src/tooltips.py
index d335c7f61c106a8a98f4254f7e5fb03bcbce475a..13f371fb8b80daef85b8f394e703710e1a349279 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -581,7 +581,8 @@ class RosterTooltip(NotificationAreaTooltip):
 		to the given property list.
 		'''
 		if 'mood' in contact.mood:
-			mood = MOODS.get(mood, contact.mood['mood'].strip())
+			mood = contact.mood['mood'].strip()
+			mood = MOODS.get(mood, mood)
 			mood = gobject.markup_escape_text(mood)
 			mood_string = _('Mood:') + ' <b>%s</b>' % mood
 			if 'text' in contact.mood \