diff --git a/config/app.yml.example b/config/app.yml.example
index ce5feaaa3..22a641470 100644
--- a/config/app.yml.example
+++ b/config/app.yml.example
@@ -61,6 +61,9 @@ default:
   # authentication
   smtp_authentication: 'plain'
 
+  # Automatically enable TLS? Ignored if smtp_authentication is set to none
+  smtp_starttls_auto: true
+
   # Credentails possibly required to log in to SMTP server if
   # smtp_authentication != 'none'
   smtp_username: 'smtp_username'
diff --git a/config/app_base.yml b/config/app_base.yml
index ce5feaaa3..22a641470 100644
--- a/config/app_base.yml
+++ b/config/app_base.yml
@@ -61,6 +61,9 @@ default:
   # authentication
   smtp_authentication: 'plain'
 
+  # Automatically enable TLS? Ignored if smtp_authentication is set to none
+  smtp_starttls_auto: true
+
   # Credentails possibly required to log in to SMTP server if
   # smtp_authentication != 'none'
   smtp_username: 'smtp_username'
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 974e55953..0f154d3e9 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -27,7 +27,7 @@ Diaspora::Application.configure do
           :authentication => AppConfig[:smtp_authentication],
           :user_name => AppConfig[:smtp_username],
           :password => AppConfig[:smtp_password],
-          :enable_starttls_auto => true
+          :enable_starttls_auto => AppConfig[:smtp_starttls_auto]
         }
       end
     end