diff --git a/HISTORY.rst b/HISTORY.rst
index 34ccfd6e63..3b8d8edaa4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -272,7 +272,7 @@
 * Add comment and make file target to generate all requirement
   files.
 * Place deletion policies units before periods for clarity.
-
+* Remove repeated EMAIL_TIMEOUT setting.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/mayan/apps/common/settings.py b/mayan/apps/common/settings.py
index cd4017dc05..bf5a411817 100644
--- a/mayan/apps/common/settings.py
+++ b/mayan/apps/common/settings.py
@@ -244,14 +244,6 @@ setting_django_email_user_ssl = namespace.add_setting(
         'are mutually exclusive, so only set one of those settings to True.'
     ),
 )
-setting_django_email_timeout = namespace.add_setting(
-    global_name='EMAIL_TIMEOUT',
-    default=settings.EMAIL_TIMEOUT,
-    help_text=_(
-        'Default: None. Specifies a timeout in seconds for blocking '
-        'operations like the connection attempt.'
-    ),
-)
 setting_django_file_upload_max_memory_size = namespace.add_setting(
     global_name='FILE_UPLOAD_MAX_MEMORY_SIZE',
     default=settings.FILE_UPLOAD_MAX_MEMORY_SIZE,