diff --git a/plugins/trezor.py b/plugins/trezor.py
index 2387cca7..b25032a1 100644
--- a/plugins/trezor.py
+++ b/plugins/trezor.py
@@ -1,13 +1,15 @@
 from PyQt4.Qt import QMessageBox, QDialog, QVBoxLayout, QLabel, QThread, SIGNAL
+import PyQt4.QtCore as QtCore
 from binascii import unhexlify
 from struct import pack
 from sys import stderr
 from time import sleep
+from base64 import b64encode, b64decode
 
 from electrum_gui.qt.password_dialog import make_password_dialog, run_password_dialog
 from electrum_gui.qt.util import ok_cancel_buttons
 from electrum.account import BIP32_Account
-from electrum.bitcoin import EncodeBase58Check
+from electrum.bitcoin import EncodeBase58Check, public_key_to_bc_address
 from electrum.i18n import _
 from electrum.plugins import BasePlugin
 from electrum.transaction import deserialize
@@ -164,6 +166,36 @@ class TrezorWallet(NewWallet):
         #do nothing - no priv keys available
         pass
 
+    def decrypt_message(self, pubkey, message, password):
+        try:
+            address = public_key_to_bc_address(pubkey.decode('hex'))
+            address_path = self.address_id(address)
+            address_n = self.get_client().expand_path(address_path)
+        except Exception, e:
+            raise e
+        try:
+            decrypted_msg = self.get_client().decrypt_message(address_n, b64decode(message))
+        except Exception, e:
+            raise e
+        finally:
+            twd.emit(SIGNAL('trezor_done'))
+        return str(decrypted_msg)
+
+    def sign_message(self, address, message, password):
+        try:
+            address_path = self.address_id(address)
+            address_n = self.get_client().expand_path(address_path)
+        except Exception, e:
+            raise
+        try:
+            msg_sig = self.get_client().sign_message('Bitcoin', address_n, message)
+        except Exception, e:
+            raise e
+        finally:
+            twd.emit(SIGNAL('trezor_done'))
+        b64_msg_sig = b64encode(msg_sig.signature)
+        return str(b64_msg_sig)
+
     def sign_transaction(self, tx, keypairs, password):
         if tx.error or tx.is_complete():
             return
@@ -289,6 +321,8 @@ class TrezorQtGuiMixin(object):
             message = "Confirm transaction outputs on Trezor device to continue"
         elif msg.code == 8:
             message = "Confirm transaction fee on Trezor device to continue"
+        elif msg.code == 7:
+            message = "Confirm message to sign on Trezor device to continue"
         else:
             message = "Check Trezor device to continue"
         twd.start(message)
@@ -355,8 +389,9 @@ class TrezorWaitingDialog(QThread):
 
     def start(self, message):
         self.d = QDialog()
-        self.d.setModal(True)
+        self.d.setModal(1)
         self.d.setWindowTitle('Please Check Trezor Device')
+        self.d.setWindowFlags(self.d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
         l = QLabel(message)
         vbox = QVBoxLayout(self.d)
         vbox.addWidget(l)