diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index b868e1678..441401a2a 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1618,8 +1618,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 					return
 				self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, msghtml,
 					statusCode))
-				if self.name not in no_log_for and not int(float(mktime(tim)))\
-				<= self.last_history_line[jid] and msgtxt:
+				if self.name not in no_log_for and jid not in no_log_for and not \
+				int(float(mktime(tim))) <= self.last_history_line[jid] and msgtxt:
 					try:
 						gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
 					except exceptions.PysqliteOperationalError, e: