diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py
index d88a4d4baa..a69907937c 100644
--- a/src/calibre/devices/hanlin/driver.py
+++ b/src/calibre/devices/hanlin/driver.py
@@ -115,7 +115,7 @@ class BOOX(HANLINV3):
     supported_platforms = ['windows', 'osx', 'linux']
 
     # Ordered list of supported formats
-    FORMATS     = ['epub', 'fb2', 'pdf', 'html', 'txt', 'rtf', 'mobi', 'prc', 'chm']
+    FORMATS     = ['epub', 'fb2', 'djvu', 'pdf', 'html', 'txt', 'rtf', 'mobi', 'prc', 'chm']
 
     VENDOR_ID   = [0x0525]
     PRODUCT_ID  = [0xa4a5]
diff --git a/src/calibre/ebooks/metadata/rar.py b/src/calibre/ebooks/metadata/rar.py
index d23577eab1..a9b5d45546 100644
--- a/src/calibre/ebooks/metadata/rar.py
+++ b/src/calibre/ebooks/metadata/rar.py
@@ -32,7 +32,7 @@ def get_metadata(stream):
         if stream_type:
             stream_type = stream_type[1:]
             if stream_type in ('lit', 'opf', 'prc', 'mobi', 'fb2', 'epub',
-                               'rb', 'imp', 'pdf', 'lrf'):
+                               'rb', 'imp', 'pdf', 'lrf', 'azw'):
                 with TemporaryDirectory() as tdir:
                     with CurrentDir(tdir):
                        stream = extract_member(path, match=None, name=f,
diff --git a/src/calibre/ebooks/metadata/zip.py b/src/calibre/ebooks/metadata/zip.py
index 08ac132d53..b8c260bd1f 100644
--- a/src/calibre/ebooks/metadata/zip.py
+++ b/src/calibre/ebooks/metadata/zip.py
@@ -23,7 +23,7 @@ def get_metadata(stream):
         if stream_type:
             stream_type = stream_type[1:]
             if stream_type in ('lit', 'opf', 'prc', 'mobi', 'fb2', 'epub',
-                               'rb', 'imp', 'pdf', 'lrf'):
+                               'rb', 'imp', 'pdf', 'lrf', 'azw'):
                 with TemporaryDirectory() as tdir:
                     with CurrentDir(tdir):
                         path = zf.extract(f)
diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
index 87019ed146..3246810010 100644
--- a/src/calibre/utils/smtp.py
+++ b/src/calibre/utils/smtp.py
@@ -135,7 +135,7 @@ def option_parser():
                             'to SMTP server.'))
     r=parser.add_option_group('SMTP RELAY',
         'Options to use an SMTP relay server to send mail. '
-        '%prog will try to send the email directly unless --relay is '
+        'calibre will try to send the email directly unless --relay is '
         'specified.').add_option
     r('-r', '--relay', help=('An SMTP relay server to use to send mail.'))
     r('-p', '--port', default=-1,