3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.h b/src/plugins/messageservices/smtp/smtpconfiguration.h
index df495c97..184121e8 100644
--- a/src/plugins/messageservices/smtp/smtpconfiguration.h
+++ b/src/plugins/messageservices/smtp/smtpconfiguration.h
@@ -64,7 +64,8 @@ public:
         Auth_LOGIN = 1,
         Auth_PLAIN = 2,
 #endif
-        Auth_INCOMING = 3
+        Auth_CRAMMD5 = 3,
+        Auth_INCOMING = 4
     };
 
     explicit SmtpConfiguration(const QMailAccountConfiguration &config);
diff --git a/src/plugins/messageservices/smtp/smtpsettings.cpp b/src/plugins/messageservices/smtp/smtpsettings.cpp
index 16c7939a..35febacc 100644
--- a/src/plugins/messageservices/smtp/smtpsettings.cpp
+++ b/src/plugins/messageservices/smtp/smtpsettings.cpp
@@ -136,6 +136,7 @@ const SmtpConfiguration::AuthType authenticationType[] = {
     SmtpConfiguration::Auth_LOGIN,
     SmtpConfiguration::Auth_PLAIN,
 #endif
+    SmtpConfiguration::Auth_CRAMMD5,
     SmtpConfiguration::Auth_INCOMING
 };
 
@@ -211,7 +212,9 @@ void SmtpSettings::authChanged(int index)
 {
 #ifndef QT_NO_OPENSSL
     SmtpConfiguration::AuthType type = authenticationType[index];
-    bool enableCredentials = (type == SmtpConfiguration::Auth_LOGIN || type == SmtpConfiguration::Auth_PLAIN);
+    bool enableCredentials = (type == SmtpConfiguration::Auth_LOGIN
+                              || type == SmtpConfiguration::Auth_PLAIN
+                              || type == SmtpConfiguration::Auth_CRAMMD5);
 
     smtpUsernameInput->setEnabled(enableCredentials);
     lblSmtpUsername->setEnabled(enableCredentials);
diff --git a/src/plugins/messageservices/smtp/smtpsettings.ui b/src/plugins/messageservices/smtp/smtpsettings.ui
index 31384bf1..e31a36ef 100644
--- a/src/plugins/messageservices/smtp/smtpsettings.ui
+++ b/src/plugins/messageservices/smtp/smtpsettings.ui
@@ -228,6 +228,11 @@
            <string>Plain</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>Cram MD5</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item row="6" column="0">