diff --git a/src/main/java/de/aservo/confapi/confluence/service/MailServerServiceImpl.java b/src/main/java/de/aservo/confapi/confluence/service/MailServerServiceImpl.java
index 8736078..537f0f7 100644
--- a/src/main/java/de/aservo/confapi/confluence/service/MailServerServiceImpl.java
+++ b/src/main/java/de/aservo/confapi/confluence/service/MailServerServiceImpl.java
@@ -1,12 +1,12 @@
 package de.aservo.confapi.confluence.service;
 
+import com.atlassian.confluence.jmx.JmxSMTPMailServer;
 import com.atlassian.mail.MailException;
 import com.atlassian.mail.MailProtocol;
 import com.atlassian.mail.server.MailServerManager;
 import com.atlassian.mail.server.PopMailServer;
 import com.atlassian.mail.server.SMTPMailServer;
 import com.atlassian.mail.server.impl.PopMailServerImpl;
-import com.atlassian.mail.server.impl.SMTPMailServerImpl;
 import com.atlassian.plugin.spring.scanner.annotation.export.ExportAsService;
 import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import de.aservo.confapi.commons.exception.BadRequestException;
@@ -41,7 +41,7 @@ public MailServerSmtpBean getMailServerSmtp() {
     public MailServerSmtpBean setMailServerSmtp(MailServerSmtpBean mailServerSmtpBean) {
         final SMTPMailServer smtpMailServer = mailServerManager.isDefaultSMTPMailServerDefined()
                 ? mailServerManager.getDefaultSMTPMailServer()
-                : new SMTPMailServerImpl();
+                : new JmxSMTPMailServer();
 
         assert smtpMailServer != null;