Merge branch 'master' into harden

3 files changed, 4 insertions, 4 deletions

diff --git a/alot/db.py b/alot/db.py
index 263990fb..d45c263f 100644
--- a/alot/db.py
+++ b/alot/db.py
@@ -229,7 +229,8 @@ class DBManager(object):
 
         :param querystring: The query string to use for the lookup
         :type query: str.
-        :returns: a pipe together with the process that asynchronously fills it.
+        :returns: a pipe together with the process that asynchronously
+                  writes to it.
         :rtype: (:class:`multiprocessing.Pipe`,
                 :class:`multiprocessing.Process`)
         """
diff --git a/alot/helper.py b/alot/helper.py
index 380733af..c4e6d7fa 100644
--- a/alot/helper.py
+++ b/alot/helper.py
@@ -11,7 +11,6 @@ from email.mime.audio import MIMEAudio
 from email.mime.base import MIMEBase
 from email.mime.image import MIMEImage
 from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
 import urwid
 
 from settings import config
diff --git a/alot/message.py b/alot/message.py
index c76d6f75..311c784a 100644
--- a/alot/message.py
+++ b/alot/message.py
@@ -164,7 +164,7 @@ class Message(object):
 
             This only adds the requested operation to this objects
             :class:`DBManager's <alot.db.DBManager>` write queue.
-            You need to call :meth:`~alot.db.DBManager.flush` to actually write out.
+            You need to call :meth:`~alot.db.DBManager.flush` to write out.
         """
         self._dbman.tag('id:' + self._id, tags)
         self._tags = self._tags.union(tags)
@@ -176,7 +176,7 @@ class Message(object):
 
             This only adds the requested operation to this objects
             :class:`DBManager's <alot.db.DBManager>` write queue.
-            You need to call :meth:`~alot.db.DBManager.flush` to actually write out.
+            You need to call :meth:`~alot.db.DBManager.flush` to actually out.
         """
 
         self._dbman.untag('id:' + self._id, tags)