diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index f50d8a85e399a5c382ba3e8f512bb12677517d5d..c1b3ca99f76d671e794709f3ac1b186bd8818c51 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -189,7 +189,7 @@ class ConnectionBytestream:
 			ft_add_hosts_to_send = map(lambda e:e.strip(),
 				ft_add_hosts_to_send.split(','))
 			for ft_host in ft_add_hosts_to_send:
-			    	ft_add_hosts.append(ft_host)
+				ft_add_hosts.append(ft_host)
 		listener = gajim.socks5queue.start_listener(port,
 			sha_str, self._result_socks5_sid, file_props['sid'])
 		if listener == None:
@@ -880,7 +880,7 @@ class ConnectionVcard:
 			ext.append('xhtml')
 		if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
 			ext.append('cstates')
- 
+
 		if len(ext):
 			c.setAttr('ext', ' '.join(ext))
 		c.setAttr('ver', gajim.version.split('-', 1)[0])
diff --git a/src/common/helpers.py b/src/common/helpers.py
index 382fce0b0fcc3ef0fde20abf8a226a19b0a21dee..7e6d96d9bc847641a57dab11a233b347b9316dc3 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -429,8 +429,8 @@ def launch_browser_mailer(kind, uri):
 			command = 'kfmclient exec'
 		elif gajim.config.get('openwith') == 'exo-open':
 			command = 'exo-open'
-		elif ((sys.platform == 'darwin') and
-			  (gajim.config.get('openwith') == 'open')):
+		elif ((sys.platform == 'darwin') and\
+		(gajim.config.get('openwith') == 'open')):
 			command = 'open'
 		elif gajim.config.get('openwith') == 'custom':
 			if kind == 'url':
@@ -459,8 +459,8 @@ def launch_file_manager(path_to_open):
 			command = 'kfmclient exec'
 		elif gajim.config.get('openwith') == 'exo-open':
 			command = 'exo-open'
-		elif ((sys.platform == 'darwin') and
-			  (gajim.config.get('openwith') == 'open')):
+		elif ((sys.platform == 'darwin') and\
+		(gajim.config.get('openwith') == 'open')):
 			command = 'open'
 		elif gajim.config.get('openwith') == 'custom':
 			command = gajim.config.get('custom_file_manager')
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index d8625d6a74e8d4e0345a14f1037fc04d48ffa582..506f280ecacab71df2709054d6b071dc08f9cf05 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -571,9 +571,9 @@ class EncryptedStanzaSession(StanzaSession):
 		self.d = crypto.powmod(g, self.y, p)
 
 		to_add = { 'my_nonce': self.n_s,
-							 'dhkeys': crypto.encode_mpi(self.d),
-							 'counter': crypto.encode_mpi(self.c_o),
-							 'nonce': self.n_o }
+						'dhkeys': crypto.encode_mpi(self.d),
+						'counter': crypto.encode_mpi(self.c_o),
+						'nonce': self.n_o }
 
 		for name in to_add:
 			b64ed = base64.b64encode(to_add[name])
diff --git a/src/config.py b/src/config.py
index 6ec676e5f09098779d15fa90aa60873d6c41f63d..d1d86840eef5aff81c4f5388bf2579931375988f 100644
--- a/src/config.py
+++ b/src/config.py
@@ -419,8 +419,8 @@ class PreferencesWindow:
 				self.applications_combobox.set_active(2)
 			elif gajim.config.get('openwith') == 'exo-open':
 				self.applications_combobox.set_active(3)
-			elif ((sys.platform == 'darwin') and
-				  (gajim.config.get('openwith') == 'open')):
+			elif ((sys.platform == 'darwin') and\ 
+			(gajim.config.get('openwith') == 'open')):
 				self.applications_combobox.set_active(1)
 			elif gajim.config.get('openwith') == 'custom':
 				if sys.platform == 'darwin':
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 53b3a68b1447d4ca6d74f253524718170ce716aa..9a88e95865d34b1fe054d8f2b0fca268508e0417 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -336,9 +336,9 @@ class ConversationTextview:
 		if None != self.smooth_id: # already scrolling
 			return False
 		self.smooth_id = gobject.timeout_add(self.SCROLL_DELAY,
-											 self.smooth_scroll)
+			self.smooth_scroll)
 		self.smooth_scroll_timer = Timer(self.MAX_SCROLL_TIME,
-										 self.smooth_scroll_timeout)
+			self.smooth_scroll_timeout)
 		self.smooth_scroll_timer.start()
 		return False
 
diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py
index 95f60ab8b873800bb3da43ada14ececde6c1c1a2..0cedc65f6d572f11f24830b5df7b75193e86146f 100644
--- a/src/dataforms_widget.py
+++ b/src/dataforms_widget.py
@@ -342,7 +342,7 @@ class SingleForm(gtk.Table, object):
 					for value, label in field.iter_options():
 						radio = gtk.RadioButton(first_radio, label=label)
 						radio.connect('toggled',
-							 self.on_list_single_radiobutton_toggled, field, value)
+							self.on_list_single_radiobutton_toggled, field, value)
 						if first_radio is None:
 							first_radio = radio
 							if field.value == '':	# TODO: is None when done