diff --git a/src/bitmessageqt/uisignaler.py b/src/bitmessageqt/uisignaler.py index 9c86f1b1..f5e14fbf 100644 --- a/src/bitmessageqt/uisignaler.py +++ b/src/bitmessageqt/uisignaler.py @@ -12,8 +12,9 @@ class UISignaler(QtCore.QThread): updateStatusBar = QtCore.Signal(object) updateSentItemStatusByToAddress = QtCore.Signal(object, str) updateSentItemStatusByAckdata = QtCore.Signal(object, str) - displayNewInboxMessage = QtCore.Signal(object, str, str, object, str) - displayNewSentMessage = QtCore.Signal(object, str, str, str, object, str) + displayNewInboxMessage = QtCore.Signal(object, str, object, object, str) + displayNewSentMessage = QtCore.Signal( + object, str, str, object, object, str) updateNetworkStatusTab = QtCore.Signal(bool, bool, Peer) updateNumberOfMessagesProcessed = QtCore.Signal() updateNumberOfPubkeysProcessed = QtCore.Signal() @@ -52,9 +53,10 @@ class UISignaler(QtCore.QThread): self.updateSentItemStatusByAckdata.emit(ackData, message) elif command == 'displayNewInboxMessage': inventoryHash, toAddress, fromAddress, subject, body = data + self.displayNewInboxMessage.emit( inventoryHash, toAddress, fromAddress, - unicode(subject, 'utf-8'), body) + subject, body) elif command == 'displayNewSentMessage': toAddress, fromLabel, fromAddress, subject, message, ackdata = data self.displayNewSentMessage.emit( diff --git a/src/helper_msgcoding.py b/src/helper_msgcoding.py index 76dad423..5e096628 100644 --- a/src/helper_msgcoding.py +++ b/src/helper_msgcoding.py @@ -155,5 +155,6 @@ class MsgDecode(object): # Throw away any extra lines (headers) after the subject. if subject: subject = subject.splitlines()[0] - self.subject = subject - self.body = body + # Field types should be the same for all message types + self.subject = unicode(subject, 'utf-8', 'replace') + self.body = unicode(body, 'utf-8', 'replace')