Merge branch '1211' into v0.6

src/helper_inbox.py

@@ -1,15 +1,21 @@
-from helper_sql import *
+"""Helper Inbox performs inbox messagese related operations."""
+
+from helper_sql import sqlExecute, sqlQuery
 import queues
 
+
 def insert(t):
     sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *t)
-    #shouldn't emit changedInboxUnread and displayNewInboxMessage at the same time
+    # shouldn't emit changedInboxUnread and displayNewInboxMessage
+    # at the same time
     # queues.UISignalQueue.put(('changedInboxUnread', None))
 
+
 def trash(msgid):
     sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', msgid)
     queues.UISignalQueue.put(('removeInboxRowByMsgid', msgid))
 
+
 def isMessageAlreadyInInbox(sigHash):
     queryReturn = sqlQuery(
         '''SELECT COUNT(*) FROM inbox WHERE sighash=?''', sigHash)