diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index fc97e27db2acccb779b6ec61447caeab5e76e023..c1a648035e655fd5d52a07f5916fd4b12925c018 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -633,8 +633,8 @@ def prepare_context_menu(self, hide_buttonbar_entries = False):
 		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
 		self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
 			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-		self.change_subject_menuitem.add_accelerator('activate', ag, gtk.keysyms.t,
-			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+		self.change_subject_menuitem.add_accelerator('activate', ag,
+			gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE)
 		self.bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b,
 			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
 		self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
diff --git a/src/message_window.py b/src/message_window.py
index 6039bd695041b05fc54fa4216a20bed82813d2b4..3a81efdb27bb9a9bb87285249f679257141a9556 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -99,10 +99,10 @@ def __init__(self, acct, type_, parent_window=None, parent_paned=None):
 		self.handlers[id] = self.window
 
 		keys=['<Control>f', '<Control>g', '<Control>h', '<Control>i',
-			'<Control>l', '<Control>L', '<Control>n', '<Control>t', '<Control>u',
-			'<Control>v', '<Control>b', '<Control><Shift>Tab', '<Control>Tab',
-			'<Control>F4', '<Control>w', '<Control>Page_Up', '<Control>Page_Down',
-			'<Alt>Right', '<Alt>Left', '<Alt>a', '<Alt>c', '<Alt>m', 'Escape'] + \
+			'<Control>l', '<Control>L', '<Control>n', '<Control>u', '<Control>v',
+			'<Control>b', '<Control><Shift>Tab', '<Control>Tab', '<Control>F4',
+			'<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right',
+			'<Alt>Left', '<Alt>a', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \
 			['<Alt>'+str(i) for i in xrange(10)]
 		accel_group = gtk.AccelGroup()
 		for key in keys:
@@ -335,9 +335,6 @@ def accel_group_func(self, accel_group, acceleratable, keyval, modifier):
 			elif control.type_id == message_control.TYPE_GC and \
 			keyval == gtk.keysyms.n: # CTRL + n
 				control._on_change_nick_menuitem_activate(None)
-			elif control.type_id == message_control.TYPE_GC and \
-			keyval == gtk.keysyms.t: # CTRL + t
-				control._on_change_subject_menuitem_activate(None)
 			elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line
 				control.clear(control.msg_textview)
 			elif keyval == gtk.keysyms.v: # CTRL + v: Paste into msg_textview
@@ -397,6 +394,9 @@ def accel_group_func(self, accel_group, acceleratable, keyval, modifier):
 				control.show_emoticons_menu()
 			elif keyval == gtk.keysyms.a: # ALT + A show actions menu
 				control.on_actions_button_clicked(control.actions_button)
+			elif control.type_id == message_control.TYPE_GC and \
+			keyval == gtk.keysyms.t: # ALT + t
+				control._on_change_subject_menuitem_activate(None)
 		# Close tab bindings
 		elif keyval == gtk.keysyms.Escape and \
 				gajim.config.get('escape_key_closes'): # Escape