diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
index c132713..6d0e8ff 100644
--- a/offlineimap/folder/Base.py
+++ b/offlineimap/folder/Base.py
@@ -366,7 +366,7 @@ class BaseFolder(object):
             raise
         except OfflineImapError as e:
             if e.severity > OfflineImapError.ERROR.MESSAGE:
-                raise # buble severe errors up
+                raise # bubble severe errors up
             self.ui.error(e, exc_info()[2])
         except Exception as e:
             self.ui.error(e, "Copying message %s [acc: %s]:\n %s" %\
diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 75520c2..69bac9a 100644
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -555,7 +555,7 @@ class IMAPFolder(BaseFolder):
                     imapobj = self.imapserver.acquireconnection()
                     if not retry_left:
                         raise OfflineImapError("Saving msg in folder '%s', "
-                              "repository '%s' failed (abort). Server reponded: %s\n"
+                              "repository '%s' failed (abort). Server responded: %s\n"
                               "Message content was: %s" %
                               (self, self.getrepository(), str(e), dbg_output),
                                                OfflineImapError.ERROR.MESSAGE)
@@ -567,7 +567,7 @@ class IMAPFolder(BaseFolder):
                     self.imapserver.releaseconnection(imapobj, True)
                     imapobj = None
                     raise OfflineImapError("Saving msg folder '%s', repo '%s'"
-                        "failed (error). Server reponded: %s\nMessage content was: "
+                        "failed (error). Server responded: %s\nMessage content was: "
                         "%s" % (self, self.getrepository(), str(e), dbg_output),
                                            OfflineImapError.ERROR.MESSAGE)
             # Checkpoint. Let it write out stuff, etc. Eg searches for