10 files changed, 9 insertions, 9 deletions
diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/mail.py
index cd345f13..cd345f13 100644
--- a/service/pixelated/adapter/pixelated_mail.py
+++ b/service/pixelated/adapter/mail.py
diff --git a/service/pixelated/adapter/soledad_querier.py b/service/pixelated/adapter/soledad_querier.py
index f121a463..318e1539 100644
--- a/service/pixelated/adapter/soledad_querier.py
+++ b/service/pixelated/adapter/soledad_querier.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.adapter.mail import PixelatedMail
 
 
 class SoledadQuerier:
diff --git a/service/pixelated/controllers/mails_controller.py b/service/pixelated/controllers/mails_controller.py
index f54fa959..6765fc78 100644
--- a/service/pixelated/controllers/mails_controller.py
+++ b/service/pixelated/controllers/mails_controller.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 import json
-from pixelated.adapter.pixelated_mail import InputMail
+from pixelated.adapter.mail import InputMail
 from pixelated.controllers import respond_json
 from flask import request
 import dateutil.parser as dateparser
diff --git a/service/pixelated/user_agent.py b/service/pixelated/user_agent.py
index 687433d7..d8c3d4a6 100644
--- a/service/pixelated/user_agent.py
+++ b/service/pixelated/user_agent.py
@@ -28,7 +28,7 @@ from pixelated.bitmask_libraries.config import LeapConfig
 from pixelated.bitmask_libraries.provider import LeapProvider
 from pixelated.bitmask_libraries.auth import LeapAuthenticator, LeapCredentials
 from pixelated.adapter.mail_service import MailService
-from pixelated.adapter.pixelated_mail import InputMail
+from pixelated.adapter.mail import InputMail
 from pixelated.adapter.soledad_querier import SoledadQuerier
 from pixelated.adapter.search import SearchEngine
 from pixelated.adapter.draft_service import DraftService
diff --git a/service/test/adapter/draft_service_test.py b/service/test/adapter/draft_service_test.py
index 99b1e3b8..cdba2acc 100644
--- a/service/test/adapter/draft_service_test.py
+++ b/service/test/adapter/draft_service_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from pixelated.adapter.pixelated_mail import InputMail
+from pixelated.adapter.mail import InputMail
 from pixelated.adapter.draft_service import DraftService
 import test_helper
 from mockito import *
diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py
index 54252f26..0d5d1125 100644
--- a/service/test/support/integration_helper.py
+++ b/service/test/support/integration_helper.py
@@ -24,7 +24,7 @@ from pixelated.adapter.search import SearchEngine
 from pixelated.adapter.tag_service import TagService
 from pixelated.adapter.draft_service import DraftService
 import pixelated.user_agent
-from pixelated.adapter.pixelated_mail import PixelatedMail, InputMail
+from pixelated.adapter.mail import PixelatedMail, InputMail
 from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes
 from pixelated.adapter.soledad_querier import SoledadQuerier
 from pixelated.controllers import *
diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py
index 4ea4afb5..881e1e5c 100644
--- a/service/test/support/test_helper.py
+++ b/service/test/support/test_helper.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from datetime import datetime
 
-from pixelated.adapter.pixelated_mail import InputMail
+from pixelated.adapter.mail import InputMail
 
 
 LEAP_FLAGS = ['\\Seen',
diff --git a/service/test/unit/adapter/pixelated_mail_sender_test.py b/service/test/unit/adapter/pixelated_mail_sender_test.py
index 207baadb..01de1cb0 100644
--- a/service/test/unit/adapter/pixelated_mail_sender_test.py
+++ b/service/test/unit/adapter/pixelated_mail_sender_test.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import unittest
 
-from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.adapter.mail import PixelatedMail
 from pixelated.adapter.pixelated_mail_sender import PixelatedMailSender
 from mockito import *
 from test.support import test_helper
diff --git a/service/test/unit/adapter/pixelated_mail_test.py b/service/test/unit/adapter/pixelated_mail_test.py
index 63995e0e..20038e96 100644
--- a/service/test/unit/adapter/pixelated_mail_test.py
+++ b/service/test/unit/adapter/pixelated_mail_test.py
@@ -16,7 +16,7 @@
 import unittest
 
 import pixelated.support.date
-from pixelated.adapter.pixelated_mail import PixelatedMail, InputMail
+from pixelated.adapter.mail import PixelatedMail, InputMail
 from mockito import *
 from test.support import test_helper
 
diff --git a/service/test/unit/adapter/pixelated_mailbox_test.py b/service/test/unit/adapter/pixelated_mailbox_test.py
index 060bbc43..0a007ba6 100644
--- a/service/test/unit/adapter/pixelated_mailbox_test.py
+++ b/service/test/unit/adapter/pixelated_mailbox_test.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import unittest
 
-from pixelated.adapter.pixelated_mail import PixelatedMail
+from pixelated.adapter.mail import PixelatedMail
 from pixelated.adapter.pixelated_mailbox import PixelatedMailbox
 from mockito import *
 from test.support import test_helper