diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index fe85a954ebe04c7837e4c6fd8942bfbdb784cd4d..b43da71a66faba5384e06887a75cabe736356836 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -268,7 +268,7 @@ def __init__(self, account, used_in_history_window = False):
 		tag.set_property('underline', pango.UNDERLINE_SINGLE)
 
 		buffer.create_tag('focus-out-line', justification = gtk.JUSTIFY_CENTER)
-		
+
 		tag = buffer.create_tag('xep0184-warning')
 
 		# One mark at the begining then 2 marks between each lines
@@ -281,7 +281,7 @@ def __init__(self, account, used_in_history_window = False):
 		self.focus_out_end_mark = None
 
 		self.xep0184_warning_tooltip = tooltips.BaseTooltip()
-		
+
 		self.line_tooltip = tooltips.BaseTooltip()
 		# use it for hr too
 		self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF
@@ -524,8 +524,8 @@ def show_focus_out_line(self):
 
 	def show_xep0184_warning_tooltip(self):
 		pointer = self.tv.get_pointer()
-		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer[0],
-			pointer[1])
+		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
+			pointer[0], pointer[1])
 		tags = self.tv.get_iter_at_location(x, y).get_tags()
 		tag_table = self.tv.get_buffer().get_tag_table()
 		xep0184_warning = False
@@ -539,11 +539,11 @@ def show_xep0184_warning_tooltip(self):
 			self.xep0184_warning_tooltip.show_tooltip(_('This message '
 			'was not delivered'),
 				8, position[1] + pointer[1])
-	
+
 	def show_line_tooltip(self):
 		pointer = self.tv.get_pointer()
-		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer[0],
-			pointer[1])
+		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
+			pointer[0], pointer[1])
 		tags = self.tv.get_iter_at_location(x, y).get_tags()
 		tag_table = self.tv.get_buffer().get_tag_table()
 		over_line = False
@@ -585,10 +585,11 @@ def on_textview_expose_event(self, widget, event):
 		return False
 
 	def on_textview_motion_notify_event(self, widget, event):
-		'''change the cursor to a hand when we are over a mail or an url'''
+		'''change the cursor to a hand when we are over a mail or an
+		url'''
 		pointer_x, pointer_y, spam = self.tv.window.get_pointer()
-		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer_x,
-			pointer_y)
+		x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT,
+			pointer_x, pointer_y)
 		tags = self.tv.get_iter_at_location(x, y).get_tags()
 		if self.change_cursor:
 			self.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(
@@ -642,8 +643,8 @@ def visit_url_from_menuitem(self, widget, link):
 	def on_textview_populate_popup(self, textview, menu):
 		'''we override the default context menu and we prepend Clear
 		(only if used_in_history_window is False)
-		and if we have sth selected we show a submenu with actions on the phrase
-		(see on_conversation_textview_button_press_event)'''
+		and if we have sth selected we show a submenu with actions on 
+		the phrase (see on_conversation_textview_button_press_event)'''
 
 		separator_menuitem_was_added = False
 		if not self.used_in_history_window: