diff --git a/src/calibre/ebooks/rtf/rtfml.py b/src/calibre/ebooks/rtf/rtfml.py
index f3febb1743..60f69e2e17 100644
--- a/src/calibre/ebooks/rtf/rtfml.py
+++ b/src/calibre/ebooks/rtf/rtfml.py
@@ -68,8 +68,13 @@ TODO:
 '''
 
 def txt2rtf(text):
+    # Escape { and } in the text.
+    text = text.replace('{', r'\'7b')
+    text = text.replace('}', r'\'7d')
+
     if not isinstance(text, unicode):
         return text
+
     buf = cStringIO.StringIO()
     for x in text:
         val = ord(x)
diff --git a/src/calibre/gui2/shortcuts.py b/src/calibre/gui2/shortcuts.py
index 55ff625fdc..5cdaf2da8a 100644
--- a/src/calibre/gui2/shortcuts.py
+++ b/src/calibre/gui2/shortcuts.py
@@ -44,9 +44,9 @@ class Customize(QFrame, Ui_Frame):
             clear.clicked.connect(partial(self.clear_clicked, which=x))
 
     def clear_clicked(self, which=0):
-         button = getattr(self, 'button%d'%which)
-         button.setText(_('None'))
-         setattr(self, 'shortcut%d'%which, None)
+        button = getattr(self, 'button%d'%which)
+        button.setText(_('None'))
+        setattr(self, 'shortcut%d'%which, None)
 
     def custom_toggled(self, checked):
         for w in ('1', '2'):