5 files changed, 7 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5fe1bb..887b8f25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD 11)
 
 option(BUILD_WIDGETS "Build widgets" OFF)
-option(BUILD_MESSAGESERVER_PLUGINS "Build plugins for the message server" ON)
 option(USE_HTML_PARSER "Use HTML parser to handle rich text" OFF)
 option(USE_ACCOUNTS_QT "Use libaccounts-qt to handle mail account" OFF)
 
diff --git a/src/libraries/qmfmessageserver/CMakeLists.txt b/src/libraries/qmfmessageserver/CMakeLists.txt
index c566d07c..ba07da4e 100644
--- a/src/libraries/qmfmessageserver/CMakeLists.txt
+++ b/src/libraries/qmfmessageserver/CMakeLists.txt
@@ -4,6 +4,7 @@ set(SRC
   qmailcredentials.cpp
   qmailmessagebuffer.cpp
   qmailmessageclassifier.cpp
+  qmailmessageserverplugin.cpp
   qmailmessageservice.cpp
   qmailserviceconfiguration.cpp
   qmailstoreaccountfilter.cpp
@@ -16,19 +17,13 @@ set(HEADERS
   qmailcredentials.h
   qmailmessagebuffer.h
   qmailmessageclassifier.h
+  qmailmessageserverplugin.h
   qmailmessageservice.h
   qmailserviceconfiguration.h
   qmailstoreaccountfilter.h
   qmailtransport.h
   qmailheartbeattimer.h)
 
-if (BUILD_MESSAGESERVER_PLUGINS)
-  set(SRC ${SRC}
-    qmailmessageserverplugin.cpp)
-  set(HEADERS ${HEADERS}
-    qmailmessageserverplugin.h)
-endif()
-
 add_library(QmfMessageServer SHARED ${SRC} ${HEADERS})
 
 target_compile_definitions(QmfMessageServer PRIVATE MESSAGESERVER_INTERNAL)
diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro
index 761866fa..eeb084fc 100644
--- a/src/libraries/qmfmessageserver/qmfmessageserver.pro
+++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro
@@ -4,13 +4,8 @@ CONFIG    += warn_on
 
 MODULE_PLUGIN_TYPES = \
     messagingframework/messageservices \
-    messagingframework/messagecredentials
-
-contains(DEFINES,MESSAGESERVER_PLUGINS) {
-    MODULE_PLUGIN_TYPES += messageserverplugins
-    HEADERS += qmailmessageserverplugin.h
-    SOURCES += qmailmessageserverplugin.cpp
-}
+    messagingframework/messagecredentials \
+    messagingframework/messageserverplugins
 
 load(qt_module)
 CONFIG -= create_cmake
@@ -23,6 +18,7 @@ HEADERS += \
     qmailcredentials.h \
     qmailmessagebuffer.h \
     qmailmessageclassifier.h \
+    qmailmessageserverplugin.h \
     qmailmessageservice.h \
     qmailserviceconfiguration.h \
     qmailstoreaccountfilter.h \
@@ -35,6 +31,7 @@ SOURCES += \
            qmailcredentials.cpp \
            qmailmessagebuffer.cpp \
            qmailmessageclassifier.cpp \
+           qmailmessageserverplugin.cpp \
            qmailmessageservice.cpp \
            qmailserviceconfiguration.cpp \
            qmailstoreaccountfilter.cpp \
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index d5d5c8a9..3e445382 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -85,9 +85,7 @@ MessageServer::~MessageServer()
         qCDebug(lcMessaging) << "Unregistered messageserver from D-Bus";
     }
 
-#ifdef MESSAGESERVER_PLUGINS
     qDeleteAll(m_plugins);
-#endif
 }
 
 bool MessageServer::init()
@@ -161,14 +159,12 @@ bool MessageServer::init()
 
     emit handler->actionsListed(QMailActionDataList());
 
-#ifdef MESSAGESERVER_PLUGINS
     qCDebug(lcMessaging) << "Initiating messageserver plugins.";
     for (const QString &plugin : QMailMessageServerPluginFactory::keys()) {
         QMailMessageServerService *service = QMailMessageServerPluginFactory::createService(plugin);
         qCDebug(lcMessaging) << "service from" << plugin << "created.";
         m_plugins.append(service);
     }
-#endif
 
     return true;
 }
diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h
index d21bd22b..06447e37 100644
--- a/src/tools/messageserver/messageserver.h
+++ b/src/tools/messageserver/messageserver.h
@@ -44,8 +44,6 @@
 class ServiceHandler;
 class QMailMessageServerService;
 
-typedef QMap<QMailMessage::MessageType, int> MessageCountMap;
-
 class MessageServer : public QObject
 {
     Q_OBJECT
@@ -64,6 +62,7 @@ public:
 
 signals:
     void messageCountUpdated();
+
 #if defined(Q_OS_UNIX)
 public slots:
     void handleSigHup(); // Qt signal handler for UNIX SIGHUP signal.
@@ -82,10 +81,7 @@ private:
     void readLogSettings() const;
 
     ServiceHandler *handler;
-
-#ifdef MESSAGESERVER_PLUGINS
     QList<QMailMessageServerService*> m_plugins;
-#endif
 
 #if defined(Q_OS_UNIX)
     static int sighupFd[2];