diff --git a/account/views.py b/account/views.py
index 2ba5739c..d6eb77d5 100644
--- a/account/views.py
+++ b/account/views.py
@@ -14,7 +14,7 @@ from rest_framework.response import Response
 from utils.shortcuts import (serializer_invalid_response, error_response,
                              success_response, error_page, paginate, rand_str)
 from utils.captcha import Captcha
-from mail.tasks import send_email
+from utils.mail import send_email
 
 from .decorators import login_required
 from .models import User, UserProfile
diff --git a/mail/__init__.py b/mail/__init__.py
deleted file mode 100644
index 9bad5790..00000000
--- a/mail/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/mail/celery.py b/mail/celery.py
deleted file mode 100644
index 9bad5790..00000000
--- a/mail/celery.py
+++ /dev/null
@@ -1 +0,0 @@
-# coding=utf-8
diff --git a/mail/tasks.py b/mail/tasks.py
deleted file mode 100644
index 490472ba..00000000
--- a/mail/tasks.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding=utf-8
-import os
-from envelopes import Envelope
-
-SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
-               "email": "noreply@qduoj.com",
-               "password": os.environ.get("smtp_password", "111111"),
-               "tls": False}
-
-
-def send_email(from_name, to_email, to_name, subject, content):
-    envelope = Envelope(from_addr=(SMTP_CONFIG["email"], from_name),
-                        to_addr=(to_email, to_name),
-                        subject=subject,
-                        html_body=content)
-    envelope.send(SMTP_CONFIG["smtp_server"],
-                  login=SMTP_CONFIG["email"],
-                  password=SMTP_CONFIG["password"],
-                  tls=SMTP_CONFIG["tls"])
diff --git a/oj/settings.py b/oj/settings.py
index ceed0fe5..e20499e2 100644
--- a/oj/settings.py
+++ b/oj/settings.py
@@ -50,7 +50,6 @@ INSTALLED_APPS = (
     'submission',
     'mq',
     'contest',
-    'mail',
 
     'django_extensions',
     'rest_framework',
@@ -118,7 +117,6 @@ AUTH_USER_MODEL = 'account.User'
 
 LOG_PATH = "log/"
 
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,
@@ -186,3 +184,8 @@ IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'upload/')
 WEBSITE_INFO = {"website_name": "qduoj",
                 "website_footer": u"青岛大学信息工程学院 创新实验室 <a href=\"http://www.miibeian.gov.cn/\">京ICP备15062075号-1</a>",
                 "url": "https://qduoj.com"}
+
+SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
+               "email": "noreply@qduoj.com",
+               "password": os.environ.get("smtp_password", "111111"),
+               "tls": False}
diff --git a/utils/mail.py b/utils/mail.py
new file mode 100644
index 00000000..5d4e1c3c
--- /dev/null
+++ b/utils/mail.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+from envelopes import Envelope
+
+from django.conf import settings
+
+
+def send_email(from_name, to_email, to_name, subject, content):
+    envelope = Envelope(from_addr=(settings.SMTP_CONFIG["email"], from_name),
+                        to_addr=(to_email, to_name),
+                        subject=subject,
+                        html_body=content)
+    envelope.send(settings.SMTP_CONFIG["smtp_server"],
+                  login=settings.SMTP_CONFIG["email"],
+                  password=settings.SMTP_CONFIG["password"],
+                  tls=settings.SMTP_CONFIG["tls"])