refactor: Envelope in its own file

3 files changed, 4 insertions, 4 deletions

diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index 8f666b73..21331ca8 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -174,7 +174,7 @@ class EditCommand(Command):
     def __init__(self, envelope=None, spawn=None, refocus=True, **kwargs):
         """
         :param envelope: email to edit
-        :type envelope: :class:`~alot.message.Envelope`
+        :type envelope: :class:`~alot.db.envelope.Envelope`
         :param spawn: force spawning of editor in a new terminal
         :type spawn: bool
         :param refocus: m
diff --git a/alot/commands/globals.py b/alot/commands/globals.py
index 77ef05d9..f99aec25 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -20,7 +20,7 @@ from alot import helper
 from alot.db.errors import DatabaseLockedError
 from alot.completion import ContactsCompleter
 from alot.completion import AccountCompleter
-from alot.db.message import Envelope
+from alot.db.envelope import Envelope
 from alot import commands
 from alot.settings import settings
 
@@ -458,7 +458,7 @@ class ComposeCommand(Command):
                  omit_signature=False, spawn=None, **kwargs):
         """
         :param envelope: use existing envelope
-        :type envelope: :class:`~alot.message.Envelope`
+        :type envelope: :class:`~alot.db.envelope.Envelope`
         :param headers: forced header values
         :type header: doct (str->str)
         :param template: name of template to parse into the envelope after
diff --git a/alot/commands/thread.py b/alot/commands/thread.py
index 50f00d9d..baf0bd1f 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -18,7 +18,7 @@ from alot.db.message import decode_header
 from alot.db.message import encode_header
 from alot.db.message import extract_headers
 from alot.db.message import extract_body
-from alot.db.message import Envelope
+from alot.db.envelope import Envelope
 from alot.db.message import Attachment
 
 from alot.db.errors import DatabaseROError