diff --git a/src/gajim.py b/src/gajim.py
index ce650c712..90bf2398a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1398,7 +1398,7 @@ class Interface:
 			ev = gajim.get_first_event(account, jid, typ)
 			# Open the window
 			self.roster.open_event(account, jid, ev)
-		elif typ == message_control.TYPE_GMAIL:
+		elif typ == 'gmail':
 			if gajim.config.get_per('accounts', account, 'savepass'):
 				url = ('http://www.google.com/accounts/ServiceLoginAuth?service=mail&Email=%s&Passwd=%s&continue=https://mail.google.com/mail') % (gajim.config.get_per('accounts', account, 'name'),gajim.config.get_per('accounts', account, 'password'))
 			else:
diff --git a/src/message_control.py b/src/message_control.py
index dc0820e5e..08d130eb9 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -24,7 +24,6 @@ from common import gajim
 TYPE_CHAT = 'chat'
 TYPE_GC = 'gc'
 TYPE_PM = 'pm'
-TYPE_GMAIL = 'gmail'
 
 ####################
 # FIXME: Can't this stuff happen once?