diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 724d95012e51bee1c20f8da3f164a9c1194c4ca9..622c92410c5620830d47ec68f811c5189e6db063 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -356,7 +356,7 @@ def make_link_menu(self, event, kind, text):
 			childs[1].connect('activate', self.on_open_link_activate, kind, text)
 			childs[2].hide() # copy mail address
 			childs[3].hide() # open mail composer
-			childs[4].hide() # jid section seperator
+			childs[4].hide() # jid section separator
 			childs[5].hide() # start chat
 			childs[6].hide() # join group chat
 			childs[7].hide() # add to roster
diff --git a/src/roster_window.py b/src/roster_window.py
index 41726b56ffd105510e08e1a4328b038c1083873c..8fba8b891c15c724f48551a232d234304856dd43 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -521,6 +521,9 @@ def on_delete_motd_menuitem_activate(self, widget, account):
 
 	def on_online_users_menuitem_activate(self, widget, account):
 		pass #FIXME: impement disco in users for 0.9
+	
+	def on_history_manager_menuitem_activate(self, widget):
+		os.system('python history_manager.py')
 
 	def get_and_connect_advanced_menuitem_menu(self, account):
 		xml = gtk.glade.XML(GTKGUI_GLADE, 'advanced_menuitem_menu', APP)
@@ -641,7 +644,7 @@ def make_menu(self):
 
 		if at_least_one_account_connected: #FIXME: move this below where we do this check
 			#and make sure it works
-			newitem = gtk.SeparatorMenuItem() # seperator
+			newitem = gtk.SeparatorMenuItem() # separator
 			sub_menu.append(newitem)
 
 			newitem = gtk.ImageMenuItem(_('Manage Bookmarks...'))
@@ -701,6 +704,16 @@ def make_menu(self):
 				advanced_menuitem_menu = self.get_and_connect_advanced_menuitem_menu(
 					account)
 				item.set_submenu(advanced_menuitem_menu)
+			
+			item = gtk.SeparatorMenuItem() # separator
+			sub_menu.append(item)
+			
+			item = gtk.ImageMenuItem(_('History Manager'))
+			icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL,
+				gtk.ICON_SIZE_MENU)
+			item.set_image(icon)
+			sub_menu.append(item)
+			item.connect('activate', self.on_history_manager_menuitem_activate)
 
 			advanced_menuitem.set_submenu(sub_menu)
 			sub_menu.show_all()
@@ -1131,13 +1144,13 @@ def mk_menu_user(self, event, iter):
 		add_special_notification_menuitem.hide()
 		add_special_notification_menuitem.set_no_show_all(True)
 
-		#skip a seperator
+		#skip a separator
 		subscription_menuitem = xml.get_widget('subscription_menuitem')
 		send_auth_menuitem, ask_auth_menuitem, revoke_auth_menuitem =\
 			subscription_menuitem.get_submenu().get_children()
 		add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
 		remove_from_roster_menuitem = xml.get_widget('remove_from_roster_menuitem')
-		#skip a seperator
+		#skip a separator
 		information_menuitem = xml.get_widget('information_menuitem')
 		history_menuitem = xml.get_widget('history_menuitem')
 
@@ -1279,7 +1292,7 @@ def mk_menu_agent(self, event, iter):
 		item.connect('activate', self.on_agent_logging, jid, 'unavailable',
 							account)
 
-		item = gtk.SeparatorMenuItem() # seperator
+		item = gtk.SeparatorMenuItem() # separator
 		menu.append(item)
 
 		item = gtk.ImageMenuItem(_('_Edit'))
@@ -1338,7 +1351,7 @@ def build_account_menu(self, account):
 		childs = account_context_menu.get_children()
 
 		status_menuitem = childs[0]
-		# we skip the seperator
+		# we skip the separator
 		# skip advanced_actions_menuitem, childs[2]
 		xml_console_menuitem = xml.get_widget('xml_console_menuitem')
 		set_motd_menuitem = xml.get_widget('set_motd_menuitem')
@@ -1384,11 +1397,14 @@ def build_account_menu(self, account):
 		sub_menu.append(item)
 		item.connect('activate', self.change_status, account, 'offline')
 
-		xml_console_menuitem.connect('activate', self.on_xml_console_menuitem_activate,
+		xml_console_menuitem.connect('activate',
+			self.on_xml_console_menuitem_activate, account)
+		set_motd_menuitem.connect('activate', self.on_set_motd_menuitem_activate,
 			account)
-		set_motd_menuitem.connect('activate', self.on_set_motd_menuitem_activate, account)
-		update_motd_menuitem.connect('activate', self.on_update_motd_menuitem_activate, account)
-		delete_motd_menuitem.connect('activate', self.on_delete_motd_menuitem_activate, account)
+		update_motd_menuitem.connect('activate',
+			self.on_update_motd_menuitem_activate, account)
+		delete_motd_menuitem.connect('activate',
+			self.on_delete_motd_menuitem_activate, account)
 		edit_account_menuitem.connect('activate', self.on_edit_account, account)
 		service_discovery_menuitem.connect('activate',
 			self.on_service_disco_menuitem_activate, account)