2 files changed, 16 insertions, 0 deletions
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index da2b47dd..43a61d66 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -51,6 +51,7 @@
 #include <qmailipc.h>
 #include <newcountnotifier.h>
 #include <qcopserver.h>
+#include <qmailmessageserverplugin.h>
 
 extern "C" {
 #ifndef Q_OS_WIN
@@ -59,6 +60,10 @@ extern "C" {
 #include <signal.h>
 }
 
+#ifdef MESSAGESERVER_PLUGINS
+#include "messageserverplugins.h"
+#endif
+
 #if defined(Q_OS_UNIX)
 int MessageServer::sighupFd[2];
 #endif
@@ -252,6 +257,16 @@ MessageServer::MessageServer(QObject *parent)
 
         emit client->actionsListed(QMailActionDataList());
     }
+
+#ifdef MESSAGESERVER_PLUGINS
+    qMailLog(Messaging) << "Initiating messageserver plugins.";
+    QStringList availablePlugins = QMailMessageServerPluginFactory::keys();
+
+    for (int i = 0; i < availablePlugins.size(); i++) {
+        QMailMessageServerPlugin *plugin = QMailMessageServerPluginFactory::createService(availablePlugins.at(i));
+        plugin->exec();
+    }
+#endif
 }
 
 MessageServer::~MessageServer()
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index fcfe535a..e4202bb4 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -46,6 +46,7 @@ SOURCES += mailmessageclient.cpp \
            prepareaccounts.cpp \
            newcountnotifier.cpp \
            servicehandler.cpp
+
 !SERVER_AS_DLL: {
     SOURCES += main.cpp
 }