Merge branch 'py3' into py3qt

src/bitmessageqt/__init__.py

@@ -4179,7 +4179,7 @@ class MyForm(settingsmixin.SMainWindow):
                             ('sent', 'ackdata') if folder == 'sent'
                             else ('inbox', 'msgid')
                         ), sqlite3.Binary(msgid)
-            )
+                    )
 
         try:
             message = queryreturn[-1][0].decode("utf-8", "replace")

src/helper_msgcoding.py

@@ -156,5 +156,5 @@ class MsgDecode(object):
         if subject:
             subject = subject.splitlines()[0]
         # Field types should be the same for all message types
-        self.subject = subject.decode('utf-8', 'replace')
-        self.body = body.decode('utf-8', 'replace')
+        self.subject = subject.decode("utf-8", "replace")
+        self.body = body.decode("utf-8", "replace")