db/envelope: move to a new module "mail"

It has nothing to do with the database.

4 files changed, 5 insertions, 5 deletions

diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index 47e7463e..ad6edc3f 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -313,7 +313,7 @@ class EditCommand(Command):
     def __init__(self, envelope=None, spawn=None, refocus=True, **kwargs):
         """
         :param envelope: email to edit
-        :type envelope: :class:`~alot.db.envelope.Envelope`
+        :type envelope: :class:`~alot.mail.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 b95d37b9..65e8973b 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -29,7 +29,7 @@ from ..completion.contacts import ContactsCompleter
 from ..completion.accounts import AccountCompleter
 from ..completion.tags import TagsCompleter
 from ..widgets.utils import DialogBox
-from ..db.envelope import Envelope
+from ..mail.envelope import Envelope
 from ..settings.const import settings
 from ..settings.errors import ConfigError, NoMatchingAccount
 from ..utils import argparse as cargparse
@@ -673,7 +673,7 @@ class ComposeCommand(Command):
             **kwargs):
         """
         :param envelope: use existing envelope
-        :type envelope: :class:`~alot.db.envelope.Envelope`
+        :type envelope: :class:`~alot.mail.envelope.Envelope`
         :param headers: forced header values
         :type headers: dict (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 ff70289b..0a13b868 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -27,7 +27,7 @@ from .common import RetagPromptCommand
 from .envelope import SendCommand
 from ..completion.contacts import ContactsCompleter
 from ..completion.path import PathCompleter
-from ..db.envelope import Envelope
+from ..mail.envelope import Envelope
 from ..db.attachment import Attachment
 from ..db.errors import DatabaseROError
 from ..settings.const import settings
diff --git a/alot/db/envelope.py b/alot/mail/envelope.py
index f9909308..5a798f19 100644
--- a/alot/db/envelope.py
+++ b/alot/mail/envelope.py
@@ -19,7 +19,7 @@ from urllib.parse import unquote
 import gpg
 import magic
 
-from .attachment import Attachment
+from ..db.attachment import Attachment
 from .. import __version__
 from .. import helper
 from .. import crypto