Merge commit 'ebdb89b8bb482bbb5ecd544c3d38bef35fc7d820'v0.4.0

61 files changed, 2547 insertions, 186 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6690c4c..210774f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0028 NEW)
 
-project(sink VERSION 0.3.0)
+project(sink VERSION 0.4.0)
 
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(BUILD_DAV "BUILD_DAV" ON)
@@ -25,7 +25,12 @@ include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
 
-find_package(Qt5 COMPONENTS REQUIRED Core Network Gui)
+ecm_setup_version(PROJECT
+                  SOVERSION sink_VERSION_MAJOR
+                  VERSION_HEADER sink_version.h
+                  )
+
+find_package(Qt5 COMPONENTS REQUIRED Core Concurrent Network Gui Test)
 find_package(KF5 COMPONENTS REQUIRED Mime Contacts)
 find_package(FlatBuffers REQUIRED 1.4.0)
 find_package(KAsync REQUIRED 0.1.2)
diff --git a/cmake/modules/FindLibgit2.cmake b/cmake/modules/FindLibgit2.cmake
index fbfb32f..3c0f78a 100644
--- a/cmake/modules/FindLibgit2.cmake
+++ b/cmake/modules/FindLibgit2.cmake
@@ -26,8 +26,6 @@ FIND_LIBRARY(LIBGIT2_LIBRARIES NAMES git2
    ${PC_LIBGIT2_LIBRARY_DIRS}
    )
 
-message("foo: ${LIBGIT2_INCLUDE_DIR} : ${PC_LIBGIT2_INCLUDEDIR} : ${PC_LIBGIT2_INCLUDE_DIRS}")
-
 # get version from header, should work on windows, too
 if(LIBGIT2_INCLUDE_DIR)
     file(STRINGS "${LIBGIT2_INCLUDE_DIR}/git2/version.h" LIBGIT2_H REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 001a412..8421fc2 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -116,13 +116,13 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}
     EXPORT_NAME ${PROJECT_NAME}
 )
 
-qt5_use_modules(${PROJECT_NAME} LINK_PUBLIC Network)
-qt5_use_modules(${PROJECT_NAME} LINK_PRIVATE Gui)
 target_link_libraries(${PROJECT_NAME}
 PUBLIC
     KAsync
+    Qt5::Network
 PRIVATE
     ${storage_LIBS}
+    Qt5::Gui
     KF5::Mime
     KF5::Contacts
 )
diff --git a/common/asyncutils.h b/common/asyncutils.h
index 67b5928..c80af30 100644
--- a/common/asyncutils.h
+++ b/common/asyncutils.h
@@ -31,12 +31,12 @@ KAsync::Job<T> run(const std::function<T()> &f, bool runAsync = true)
         return KAsync::start<T>([f](KAsync::Future<T> &future) {
             auto result = QtConcurrent::run(f);
             auto watcher = new QFutureWatcher<T>;
-            watcher->setFuture(result);
             QObject::connect(watcher, &QFutureWatcher<T>::finished, watcher, [&future, watcher]() {
                 future.setValue(watcher->future().result());
                 delete watcher;
                 future.setFinished();
             });
+            watcher->setFuture(result);
         });
     } else {
         return KAsync::start<T>([f]() {
diff --git a/common/definitions.cpp b/common/definitions.cpp
index 17977bc..ee18d52 100644
--- a/common/definitions.cpp
+++ b/common/definitions.cpp
@@ -39,11 +39,17 @@ QString Sink::storageLocation()
     return dataLocation() + "/storage";
 }
 
+static QString sinkLocation(QStandardPaths::StandardLocation location)
+{
+    return QStandardPaths::writableLocation(location) + "/sink";
+}
+
 QString Sink::dataLocation()
 {
-    static QString location;
+    static QString location = sinkLocation(QStandardPaths::GenericDataLocation);
+    //Warning: This is not threadsafe, but clearLocationCache is only ever used in testcode. The initialization above is required to make at least the initialization threadsafe (relies on C++11 threadsafe initialization).
     if (rereadDataLocation) {
-        location = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink";
+        location = sinkLocation(QStandardPaths::GenericDataLocation);
         rereadDataLocation = false;
     }
     return location;
@@ -51,9 +57,10 @@ QString Sink::dataLocation()
 
 QString Sink::configLocation()
 {
-    static QString location;
+    static QString location = sinkLocation(QStandardPaths::GenericConfigLocation);
+    //Warning: This is not threadsafe, but clearLocationCache is only ever used in testcode. The initialization above is required to make at least the initialization threadsafe (relies on C++11 threadsafe initialization).
     if (rereadConfigLocation) {
-        location = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/sink";
+        location = sinkLocation(QStandardPaths::GenericConfigLocation);
         rereadConfigLocation = false;
     }
     return location;
@@ -61,8 +68,9 @@ QString Sink::configLocation()
 
 QString Sink::temporaryFileLocation()
 {
-    static QString location;
+    static QString location = dataLocation() + "/temporaryFiles";
     static bool dirCreated = false;
+    //Warning: This is not threadsafe, but clearLocationCache is only ever used in testcode. The initialization above is required to make at least the initialization threadsafe (relies on C++11 threadsafe initialization).
     if (rereadTemporaryFileLocation) {
         location = dataLocation() + "/temporaryFiles";
         dirCreated = QDir{}.mkpath(location);
diff --git a/common/definitions.h b/common/definitions.h
index ce9e794..7ef215b 100644
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -25,10 +25,16 @@
 #include <QByteArray>
 
 namespace Sink {
-void SINK_EXPORT clearLocationCache();
 QString SINK_EXPORT storageLocation();
 QString SINK_EXPORT dataLocation();
 QString SINK_EXPORT configLocation();
 QString SINK_EXPORT temporaryFileLocation();
 QString SINK_EXPORT resourceStorageLocation(const QByteArray &resourceInstanceIdentifier);
+
+/**
+ * Clear the location cache and lookup locations again.
+ *
+ * Warning: Calling this results in non-threadsafe initialization, only use it in test-code.
+ */
+void SINK_EXPORT clearLocationCache();
 }
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 3718f77..ee70c35 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -34,7 +34,13 @@ QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDom
 QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDomain::ApplicationDomainType &type)
 {
     d << "ApplicationDomainType(\n";
-    auto properties = type.mAdaptor->availableProperties();
+    auto properties = [&] {
+        if (!type.changedProperties().isEmpty()) {
+            return type.changedProperties();
+        } else {
+            return type.mAdaptor->availableProperties();
+        }
+    }();
     std::sort(properties.begin(), properties.end());
     d << " " << "Id: " << "\t" << type.identifier() << "\n";
     d << " " << "Resource: " << "\t" << type.resourceInstanceIdentifier() << "\n";
@@ -216,8 +222,13 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 void ApplicationDomainType::setProperty(const QByteArray &key, const QVariant &value)
 {
     Q_ASSERT(mAdaptor);
-    mChangeSet->insert(key);
-    mAdaptor->setProperty(key, value);
+    auto existing = mAdaptor->getProperty(key);
+    if (existing.isValid() && existing == value) {
+        SinkTrace() << "Tried to set property that is still the same: " << key << value;
+    } else {
+        mChangeSet->insert(key);
+        mAdaptor->setProperty(key, value);
+    }
 }
 
 void ApplicationDomainType::setResource(const QByteArray &identifier)
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 602d54c..f7fd07e 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -101,6 +101,7 @@ enum SINK_EXPORT ErrorCode {
     LoginError,
     ConfigurationError,
     TransmissionError,
+    ConnectionLostError,
 };
 
 enum SINK_EXPORT SuccessCode {
@@ -118,12 +119,14 @@ enum SINK_EXPORT SyncStatus {
  * The status of an account or resource.
  *
  * It is set as follows:
- * * By default the status is offline.
+ * * By default the status is no status.
+ * * If a connection to the server failed the status is Offline.
  * * If a connection to the server could be established the status is Connected.
  * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
  * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
  */
 enum SINK_EXPORT Status {
+    NoStatus,
     OfflineStatus,
     ConnectedStatus,
     BusyStatus,
@@ -270,7 +273,17 @@ public:
     bool hasProperty(const QByteArray &key) const;
 
     QVariant getProperty(const QByteArray &key) const;
+
+    /**
+     * Set a property and record a changed property
+     *
+     * If the propery is available and did not change the call will be ignored.
+     */
     void setProperty(const QByteArray &key, const QVariant &value);
+
+    /**
+     * Convenience method to set a reference property.
+     */
     void setProperty(const QByteArray &key, const ApplicationDomainType &value);
 
     QByteArray getBlobProperty(const QByteArray &key) const;
diff --git a/common/domain/applicationdomaintype_p.h b/common/domain/applicationdomaintype_p.h
index a5a6b1d..a60df38 100644
--- a/common/domain/applicationdomaintype_p.h
+++ b/common/domain/applicationdomaintype_p.h
@@ -45,5 +45,7 @@ struct TypeHelper {
         } else {
             Q_ASSERT(false);
         }
+        //Silence compiler warning
+        return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...));
     }
 };
diff --git a/common/log.cpp b/common/log.cpp
index 5dfb872..bfc9d5e 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -10,7 +10,6 @@
 #include <QMutexLocker>
 #include <iostream>
 #include <unistd.h>
-#include <memory>
 #include <atomic>
 #include <definitions.h>
 #include <QThreadStorage>
@@ -27,10 +26,13 @@ static QSettings &config()
     return *sSettings.localData();
 }
 
-static QByteArray sPrimaryComponent;
+Q_GLOBAL_STATIC(QByteArray, sPrimaryComponent);
+
 void Sink::Log::setPrimaryComponent(const QString &component)
 {
-    sPrimaryComponent = component.toUtf8();
+    if (!sPrimaryComponent.isDestroyed()) {
+        *sPrimaryComponent = component.toUtf8();
+    }
 }
 
 class DebugStream : public QIODevice
@@ -267,16 +269,21 @@ public:
     QSet<QString> mDebugAreas;
 };
 
-static auto sDebugAreaCollector = std::unique_ptr<DebugAreaCollector>(new DebugAreaCollector);
+Q_GLOBAL_STATIC(DebugAreaCollector, sDebugAreaCollector);
 
 QSet<QString> Sink::Log::debugAreas()
 {
-    return sDebugAreaCollector->debugAreas();
+    if (!sDebugAreaCollector.isDestroyed()) {
+        return sDebugAreaCollector->debugAreas();
+    }
+    return {};
 }
 
 static void collectDebugArea(const QString &debugArea)
 {
-    sDebugAreaCollector->add(debugArea);
+    if (!sDebugAreaCollector.isDestroyed()) {
+        sDebugAreaCollector->add(debugArea);
+    }
 }
 
 static bool containsItemStartingWith(const QByteArray &pattern, const QByteArrayList &list)
@@ -318,13 +325,17 @@ static QByteArray getFileName(const char *file)
 
 static QString assembleDebugArea(const char *debugArea, const char *debugComponent, const char *file)
 {
-    if (sPrimaryComponent.isEmpty()) {
-        sPrimaryComponent = getProgramName();
+    if (!sPrimaryComponent.isDestroyed() && sPrimaryComponent->isEmpty()) {
+        *sPrimaryComponent = getProgramName();
+    }
+    if (!sPrimaryComponent.isDestroyed()) {
+        //Using stringbuilder for fewer allocations
+        return QLatin1String{*sPrimaryComponent} % QLatin1String{"."} %
+            (debugComponent ? (QLatin1String{debugComponent} + QLatin1String{"."}) : QLatin1String{""}) %
+            (debugArea ? QLatin1String{debugArea} : QLatin1String{getFileName(file)});
+    } else {
+        return {};
     }
-    //Using stringbuilder for fewer allocations
-    return QLatin1String{sPrimaryComponent} % QLatin1String{"."} %
-        (debugComponent ? (QLatin1String{debugComponent} + QLatin1String{"."}) : QLatin1String{""}) %
-        (debugArea ? QLatin1String{debugArea} : QLatin1String{getFileName(file)});
 }
 
 static bool isFiltered(DebugLevel debugLevel, const QByteArray &fullDebugArea)
@@ -346,14 +357,19 @@ bool Sink::Log::isFiltered(DebugLevel debugLevel, const char *debugArea, const c
     return isFiltered(debugLevel, assembleDebugArea(debugArea, debugComponent, file).toLatin1());
 }
 
+Q_GLOBAL_STATIC(NullStream, sNullStream);
+Q_GLOBAL_STATIC(DebugStream, sDebugStream);
+
 QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea, const char *debugComponent)
 {
     const auto fullDebugArea = assembleDebugArea(debugArea, debugComponent, file);
     collectDebugArea(fullDebugArea);
 
-    static NullStream nullstream;
     if (isFiltered(debugLevel, fullDebugArea.toLatin1())) {
-        return QDebug(&nullstream);
+        if (!sNullStream.isDestroyed()) {
+            return QDebug(sNullStream);
+        }
+        return QDebug{QtDebugMsg};
     }
 
     QString prefix;
@@ -418,8 +434,10 @@ QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char *file,
     }
     output += ":";
 
-    static DebugStream stream;
-    QDebug debug(&stream);
+    if (sDebugStream.isDestroyed()) {
+        return QDebug{QtDebugMsg};
+    }
+    QDebug debug(sDebugStream);
 
     debug.noquote().nospace() << output;
 
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index 4171d85..1401fc8 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -34,9 +34,37 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
 
     QVector<QByteArray> thread;
 
-    //a child already registered our thread.
+    //check if a child already registered our thread.
     thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(messageId);
 
+    if (!thread.isEmpty()) {
+        //A child already registered our thread so we merge the childs thread
+        //* check if we have a parent thread, if not just continue as usual
+        //* get all messages that have the same threadid as the child
+        //* switch all to the parents thread
+        auto parentThread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(parentMessageId);
+        if (!parentThread.isEmpty()) {
+            auto childThreadId = thread.first();
+            auto parentThreadId = parentThread.first();
+            SinkTrace() << "Merging child thread: " << childThreadId << " into parent thread: " << parentThreadId;
+
+            //Ensure this mail ends up in the correct thread
+            index().unindex<Mail::MessageId, Mail::ThreadId>(messageId, childThreadId, transaction);
+            //We have to copy the id here, otherwise it doesn't survive the subsequent writes
+            thread = QVector<QByteArray>() << QByteArray{parentThreadId.data(), parentThreadId.size()};
+
+            //Merge all child messages into the correct thread
+            auto childThreadMessageIds = index().secondaryLookup<Mail::ThreadId, Mail::MessageId>(childThreadId);
+            for (const auto &msgId : childThreadMessageIds) {
+                SinkTrace() << "Merging child message: " << msgId;
+                index().unindex<Mail::MessageId, Mail::ThreadId>(msgId, childThreadId, transaction);
+                index().unindex<Mail::ThreadId, Mail::MessageId>(childThreadId, msgId, transaction);
+                index().index<Mail::MessageId, Mail::ThreadId>(msgId, parentThreadId, transaction);
+                index().index<Mail::ThreadId, Mail::MessageId>(parentThreadId, msgId, transaction);
+            }
+        }
+    }
+
     //If parent is already available, add to thread of parent
     if (thread.isEmpty() && parentMessageId.isValid()) {
         thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(parentMessageId);
diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp
index 5c54fbc..253e8b4 100644
--- a/common/mailpreprocessor.cpp
+++ b/common/mailpreprocessor.cpp
@@ -104,9 +104,6 @@ static void updatedIndexedProperties(Sink::ApplicationDomain::Mail &mail, KMime:
     mail.setExtractedBcc(getContactList(msg->bcc(true)));
     mail.setExtractedDate(msg->date(true)->dateTime());
 
-    //The rest should never change, unless we didn't have the headers available initially.
-    auto messageId = msg->messageID(true)->identifier();
-
     //Ensure the mssageId is unique.
     //If there already is one with the same id we'd have to assign a new message id, which probably doesn't make any sense.
 
@@ -125,12 +122,21 @@ static void updatedIndexedProperties(Sink::ApplicationDomain::Mail &mail, KMime:
             parentMessageId = inReplyTo.first();
         }
     }
+
+    //The rest should never change, unless we didn't have the headers available initially.
+    auto messageId = msg->messageID(true)->identifier();
     if (messageId.isEmpty()) {
-        auto tmp = KMime::Message::Ptr::create();
-        auto header = tmp->messageID(true);
-        header->generate("kube.kde.org");
-        messageId = header->as7BitString();
-        SinkWarning() << "Message id is empty, generating one: " << messageId;
+        //reuse an existing messageis (on modification)
+        auto existing = mail.getMessageId();
+        if (existing.isEmpty()) {
+            auto tmp = KMime::Message::Ptr::create();
+            auto header = tmp->messageID(true);
+            header->generate("kube.kde.org");
+            messageId = header->as7BitString();
+            SinkWarning() << "Message id is empty, generating one: " << messageId;
+        } else {
+            messageId = existing;
+        }
     }
 
     mail.setExtractedMessageId(messageId);
diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index 58703ab..95f4643 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -298,16 +298,16 @@ void ModelResult<T, Ptr>::add(const Ptr &value)
     auto parent = createIndexFromId(id);
     SinkTraceCtx(mLogCtx) << "Added entity " << childId <<  "id: " << value->identifier() << "parent: " << id;
     const auto keys = mTree[id];
-    int index = 0;
-    for (; index < keys.size(); index++) {
-        if (childId < keys.at(index)) {
+    int idx = 0;
+    for (; idx < keys.size(); idx++) {
+        if (childId < keys.at(idx)) {
             break;
         }
     }
     // SinkTraceCtx(mLogCtx) << "Inserting rows " << index << parent;
-    beginInsertRows(parent, index, index);
+    beginInsertRows(parent, idx, idx);
     mEntities.insert(childId, value);
-    mTree[id].insert(index, childId);
+    mTree[id].insert(idx, childId);
     mParents.insert(childId, id);
     endInsertRows();
     // SinkTraceCtx(mLogCtx) << "Inserted rows " << mTree[id].size();
diff --git a/common/notification.cpp b/common/notification.cpp
index da31e20..20bc654 100644
--- a/common/notification.cpp
+++ b/common/notification.cpp
@@ -48,7 +48,7 @@ static QByteArray name(int type)
 
 QDebug operator<<(QDebug dbg, const Sink::Notification &n)
 {
-    dbg << "Notification(Type:" << name(n.type) << "Id, :" << n.id  << ", Code:";
+    dbg << "Notification(Type:" << name(n.type) << ", Id:" << n.id  << ", Code:";
     dbg << n.code;
     dbg << ", Message:" << n.message << ", Entities:" << n.entities << ")";
     return dbg.space();
diff --git a/common/notifier.cpp b/common/notifier.cpp
index 1af65e9..1b7cbdb 100644
--- a/common/notifier.cpp
+++ b/common/notifier.cpp
@@ -49,6 +49,7 @@ public:
 
     QList<QSharedPointer<ResourceAccess>> resourceAccess;
     QList<std::function<void(const Notification &)>> handler;
+    QSharedPointer<Sink::ResultEmitter<QSharedPointer<Sink::ApplicationDomain::SinkResource> > > mResourceEmitter;
     QObject context;
 };
 
@@ -91,6 +92,9 @@ Notifier::Notifier(const Sink::Query &resourceQuery) : d(new Sink::Notifier::Pri
         SinkTraceCtx(resourceCtx) << "Resource query complete";
     });
     emitter->fetch({});
+    if (resourceQuery.liveQuery()) {
+        d->mResourceEmitter = emitter;
+    }
     result.first.exec();
 }
 
diff --git a/common/resource.cpp b/common/resource.cpp
index 32a92ca..804f0bf 100644
--- a/common/resource.cpp
+++ b/common/resource.cpp
@@ -56,10 +56,10 @@ class ResourceFactory::Private
 {
 public:
     QByteArrayList capabilities;
-    static QHash<QString, QPointer<ResourceFactory>> s_loadedFactories;
 };
 
-QHash<QString, QPointer<ResourceFactory>> ResourceFactory::Private::s_loadedFactories;
+typedef QHash<QString, QPointer<ResourceFactory>> FactoryRegistry;
+Q_GLOBAL_STATIC(FactoryRegistry, s_loadedFactories);
 
 ResourceFactory::ResourceFactory(QObject *parent, const QByteArrayList &capabilities) : QObject(parent), d(new ResourceFactory::Private)
 {
@@ -73,7 +73,7 @@ ResourceFactory::~ResourceFactory()
 
 ResourceFactory *ResourceFactory::load(const QByteArray &resourceName)
 {
-    ResourceFactory *factory = Private::s_loadedFactories.value(resourceName);
+    ResourceFactory *factory = s_loadedFactories->value(resourceName);
     if (factory) {
         return factory;
     }
@@ -96,7 +96,7 @@ ResourceFactory *ResourceFactory::load(const QByteArray &resourceName)
                     if (object) {
                         factory = qobject_cast<ResourceFactory *>(object);
                         if (factory) {
-                            Private::s_loadedFactories.insert(resourceName, factory);
+                            s_loadedFactories->insert(resourceName, factory);
                             //TODO: Instead of always loading both facades and adaptorfactories into the respective singletons, we could also leave this up to the caller. (ResourceFactory::loadFacades(...))
                             factory->registerFacades(resourceName, FacadeFactory::instance());
                             factory->registerAdaptorFactories(resourceName, AdaptorFactoryRegistry::instance());
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 808d892..35fa46c 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -232,7 +232,7 @@ KAsync::Job<void> ResourceAccess::Private::initializeSocket()
 ResourceAccess::ResourceAccess(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType)
     : ResourceAccessInterface(), d(new Private(resourceType, resourceInstanceIdentifier, this))
 {
-    mResourceStatus = Sink::ApplicationDomain::OfflineStatus;
+    mResourceStatus = Sink::ApplicationDomain::NoStatus;
     SinkTrace() << "Starting access";
 }
 
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index dab6aed..0687bbc 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -24,6 +24,7 @@
 #include "store.h"
 #include "resourceaccess.h"
 #include "resource.h"
+#include "facadefactory.h"
 
 using namespace Sink;
 
@@ -358,27 +359,50 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain
     auto ctx = parentCtx.subContext("accounts");
     auto runner = new LocalStorageQueryRunner<ApplicationDomain::SinkAccount>(query, mIdentifier, mTypeName, sConfigNotifier, ctx);
     auto monitoredResources = QSharedPointer<QSet<QByteArray>>::create();
-    runner->setStatusUpdater([runner, monitoredResources, ctx](ApplicationDomain::SinkAccount &account) {
-        Query query;
+    auto monitorResource = [monitoredResources, runner, ctx] (const QByteArray &accountIdentifier, const ApplicationDomain::SinkResource &resource, const ResourceAccess::Ptr &resourceAccess) {
+        if (!monitoredResources->contains(resource.identifier())) {
+            auto ret = QObject::connect(resourceAccess.data(), &ResourceAccess::notification, runner->guard(), [resource, runner, resourceAccess, accountIdentifier, ctx](const Notification &notification) {
+                SinkTraceCtx(ctx) << "Received notification in facade: " << notification.type;
+                if (notification.type == Notification::Status) {
+                    runner->statusChanged(accountIdentifier);
+                }
+            });
+            Q_ASSERT(ret);
+            monitoredResources->insert(resource.identifier());
+        }
+    };
+    runner->setStatusUpdater([this, runner, monitoredResources, ctx, monitorResource](ApplicationDomain::SinkAccount &account) {
+        Query query{Query::LiveQuery};
         query.filter<ApplicationDomain::SinkResource::Account>(account.identifier());
         query.request<ApplicationDomain::SinkResource::Account>()
              .request<ApplicationDomain::SinkResource::Capabilities>();
         const auto resources = Store::read<ApplicationDomain::SinkResource>(query);
         SinkTraceCtx(ctx) << "Found resource belonging to the account " << account.identifier() << " : " << resources;
         auto accountIdentifier = account.identifier();
+
+        //Monitor for new resources so they can be monitored as well
+        if (!runner->mResourceEmitter.contains(accountIdentifier)) {
+            auto facade = Sink::FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>();
+            Q_ASSERT(facade);
+
+            auto emitter = facade->load(query, ctx).second;
+            emitter->onAdded([=](const ApplicationDomain::SinkResource::Ptr &resource) {
+                auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resource->identifier(), ResourceConfig::getResourceType(resource->identifier()));
+                monitorResource(accountIdentifier, *resource, resourceAccess);
+            });
+            emitter->onModified([](const ApplicationDomain::SinkResource::Ptr &) {});
+            emitter->onRemoved([](const ApplicationDomain::SinkResource::Ptr &) {});
+            emitter->onInitialResultSetComplete([](const ApplicationDomain::SinkResource::Ptr &, bool) {});
+            emitter->onComplete([]() {});
+            emitter->fetch({});
+            runner->mResourceEmitter[accountIdentifier] = emitter;
+        }
+
         QList<int> states;
+        //Gather all resources and ensure they are monitored
         for (const auto &resource : resources) {
             auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource.identifier(), ResourceConfig::getResourceType(resource.identifier()));
-            if (!monitoredResources->contains(resource.identifier())) {
-                auto ret = QObject::connect(resourceAccess.data(), &ResourceAccess::notification, runner->guard(), [resource, runner, resourceAccess, accountIdentifier, ctx](const Notification &notification) {
-                    SinkTraceCtx(ctx) << "Received notification in facade: " << notification.type;
-                    if (notification.type == Notification::Status) {
-                        runner->statusChanged(accountIdentifier);
-                    }
-                });
-                Q_ASSERT(ret);
-                monitoredResources->insert(resource.identifier());
-            }
+            monitorResource(accountIdentifier, resource, resourceAccess);
             states << resourceAccess->getResourceStatus();
         }
         const auto status = [&] {
@@ -391,7 +415,10 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain
             if (states.contains(ApplicationDomain::OfflineStatus)) {
                 return ApplicationDomain::OfflineStatus;
             }
-            return ApplicationDomain::ConnectedStatus;
+            if (states.contains(ApplicationDomain::ConnectedStatus)) {
+                return ApplicationDomain::ConnectedStatus;
+            }
+            return ApplicationDomain::NoStatus;
         }();
         account.setStatusStatus(status);
     });
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
index 76fadce..36049c4 100644
--- a/common/resourcefacade.h
+++ b/common/resourcefacade.h
@@ -65,6 +65,7 @@ public:
     void setStatusUpdater(const std::function<void(DomainType &)> &);
     void statusChanged(const QByteArray &identifier);
     QObject *guard() const;
+    QMap<QByteArray, QSharedPointer<Sink::ResultEmitter<QSharedPointer<Sink::ApplicationDomain::SinkResource> > > > mResourceEmitter;
 
 private:
     void updateStatus(DomainType &entity);
diff --git a/common/storage.h b/common/storage.h
index 8c129df..c39b904 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -198,9 +198,9 @@ public:
     static QByteArray getTypeFromRevision(const Transaction &, qint64 revision);
     static void recordRevision(Transaction &, qint64 revision, const QByteArray &uid, const QByteArray &type);
     static void removeRevision(Transaction &, qint64 revision);
-    static void recordUid(DataStore::Transaction &transaction, const QByteArray &uid);
-    static void removeUid(DataStore::Transaction &transaction, const QByteArray &uid);
-    static void getUids(const Transaction &, const std::function<void(const QByteArray &uid)> &);
+    static void recordUid(DataStore::Transaction &transaction, const QByteArray &uid, const QByteArray &type);
+    static void removeUid(DataStore::Transaction &transaction, const QByteArray &uid, const QByteArray &type);
+    static void getUids(const QByteArray &type, const Transaction &, const std::function<void(const QByteArray &uid)> &);
 
     bool exists() const;
 
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index 22e5ae3..5514e31 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -267,7 +267,7 @@ bool EntityStore::add(const QByteArray &type, ApplicationDomain::ApplicationDoma
             [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to write entity" << entity.identifier() << newRevision; });
     DataStore::setMaxRevision(d->transaction, newRevision);
     DataStore::recordRevision(d->transaction, newRevision, entity.identifier(), type);
-    DataStore::recordUid(d->transaction, entity.identifier());
+    DataStore::recordUid(d->transaction, entity.identifier(), type);
     SinkTraceCtx(d->logCtx) << "Wrote entity: " << entity.identifier() << type << newRevision;
     return true;
 }
@@ -379,7 +379,7 @@ bool EntityStore::remove(const QByteArray &type, const Sink::ApplicationDomain::
             [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to write entity" << uid << newRevision; });
     DataStore::setMaxRevision(d->transaction, newRevision);
     DataStore::recordRevision(d->transaction, newRevision, uid, type);
-    DataStore::removeUid(d->transaction, uid);
+    DataStore::removeUid(d->transaction, uid, type);
     return true;
 }
 
@@ -516,9 +516,8 @@ void EntityStore::readLatest(const QByteArray &type, const QByteArray &uid, cons
 {
     auto db = DataStore::mainDatabase(d->getTransaction(), type);
     db.findLatest(uid,
-        [=](const QByteArray &key, const QByteArray &value) -> bool {
+        [=](const QByteArray &key, const QByteArray &value) {
             callback(DataStore::uidFromKey(key), Sink::EntityBuffer(value.data(), value.size()));
-            return false;
         },
         [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Error during query: " << error.message << uid; });
 }
@@ -639,7 +638,7 @@ ApplicationDomain::ApplicationDomainType EntityStore::readPrevious(const QByteAr
 
 void EntityStore::readAllUids(const QByteArray &type, const std::function<void(const QByteArray &uid)> callback)
 {
-    DataStore::getUids(d->getTransaction(), callback);
+    DataStore::getUids(type, d->getTransaction(), callback);
 }
 
 bool EntityStore::contains(const QByteArray &type, const QByteArray &uid)
@@ -653,7 +652,7 @@ bool EntityStore::exists(const QByteArray &type, const QByteArray &uid)
     bool alreadyRemoved = false;
     DataStore::mainDatabase(d->transaction, type)
         .findLatest(uid,
-            [&found, &alreadyRemoved](const QByteArray &key, const QByteArray &data) -> bool {
+            [&found, &alreadyRemoved](const QByteArray &key, const QByteArray &data) {
                 auto entity = GetEntity(data.data());
                 if (entity && entity->metadata()) {
                     auto metadata = GetMetadata(entity->metadata()->Data());
@@ -662,7 +661,6 @@ bool EntityStore::exists(const QByteArray &type, const QByteArray &uid)
                         alreadyRemoved = true;
                     }
                 }
-                return false;
             },
             [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read old revision from storage: " << error.message; });
     if (!found) {
diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index 8603787..630dae9 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -156,19 +156,19 @@ void DataStore::removeRevision(DataStore::Transaction &transaction, qint64 revis
     transaction.openDatabase("revisionType").remove(QByteArray::number(revision));
 }
 
-void DataStore::recordUid(DataStore::Transaction &transaction, const QByteArray &uid)
+void DataStore::recordUid(DataStore::Transaction &transaction, const QByteArray &uid, const QByteArray &type)
 {
-    transaction.openDatabase("uids").write(uid, "");
+    transaction.openDatabase(type + "uids").write(uid, "");
 }
 
-void DataStore::removeUid(DataStore::Transaction &transaction, const QByteArray &uid)
+void DataStore::removeUid(DataStore::Transaction &transaction, const QByteArray &uid, const QByteArray &type)
 {
-    transaction.openDatabase("uids").remove(uid);
+    transaction.openDatabase(type + "uids").remove(uid);
 }
 
-void DataStore::getUids(const Transaction &transaction, const std::function<void(const QByteArray &uid)> &callback)
+void DataStore::getUids(const QByteArray &type, const Transaction &transaction, const std::function<void(const QByteArray &uid)> &callback)
 {
-    transaction.openDatabase("uids").scan("", [&] (const QByteArray &key, const QByteArray &) {
+    transaction.openDatabase(type + "uids").scan("", [&] (const QByteArray &key, const QByteArray &) {
         callback(key);
         return true;
     });
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index f7999d1..58e3a9a 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -406,7 +406,7 @@ int DataStore::NamedDatabase::scan(const QByteArray &k, const std::function<bool
     mdb_cursor_close(cursor);
 
     if (rc) {
-        Error error(d->name.toLatin1() + d->db, getErrorCode(rc), QByteArray("Key: ") + k + " : " + QByteArray(mdb_strerror(rc)));
+        Error error(d->name.toLatin1() + d->db, getErrorCode(rc), QByteArray("Error during scan. Key: ") + k + " : " + QByteArray(mdb_strerror(rc)));
         errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
     }
 
@@ -420,6 +420,11 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi
         // Not an error. We rely on this to read nothing from non-existing databases.
         return;
     }
+    if (k.isEmpty()) {
+        Error error(d->name.toLatin1() + d->db, GenericError, QByteArray("Can't use findLatest with empty key."));
+        errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
+        return;
+    }
 
     int rc;
     MDB_val key;
@@ -441,25 +446,23 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi
     if ((rc = mdb_cursor_get(cursor, &key, &data, op)) == 0) {
         // The first lookup will find a key that is equal or greather than our key
         if (QByteArray::fromRawData((char *)key.mv_data, key.mv_size).startsWith(k)) {
-            bool advanced = false;
+            //Read next value until we no longer match
             while (QByteArray::fromRawData((char *)key.mv_data, key.mv_size).startsWith(k)) {
-                advanced = true;
                 MDB_cursor_op nextOp = MDB_NEXT;
                 rc = mdb_cursor_get(cursor, &key, &data, nextOp);
                 if (rc) {
                     break;
                 }
             }
-            if (advanced) {
-                MDB_cursor_op prefOp = MDB_PREV;
-                // We read past the end above, just take the last value
-                if (rc == MDB_NOTFOUND) {
-                    prefOp = MDB_LAST;
-                }
-                rc = mdb_cursor_get(cursor, &key, &data, prefOp);
-                foundValue = true;
-                resultHandler(QByteArray::fromRawData((char *)key.mv_data, key.mv_size), QByteArray::fromRawData((char *)data.mv_data, data.mv_size));
+            //Now read the previous value, and that's the latest one
+            MDB_cursor_op prefOp = MDB_PREV;
+            // We read past the end above, just take the last value
+            if (rc == MDB_NOTFOUND) {
+                prefOp = MDB_LAST;
             }
+            rc = mdb_cursor_get(cursor, &key, &data, prefOp);
+            foundValue = true;
+            resultHandler(QByteArray::fromRawData((char *)key.mv_data, key.mv_size), QByteArray::fromRawData((char *)data.mv_data, data.mv_size));
         }
     }
 
@@ -471,10 +474,10 @@ void DataStore::NamedDatabase::findLatest(const QByteArray &k, const std::functi
     mdb_cursor_close(cursor);
 
     if (rc) {
-        Error error(d->name.toLatin1(), getErrorCode(rc), QByteArray("Key: ") + k + " : " + QByteArray(mdb_strerror(rc)));
+        Error error(d->name.toLatin1(), getErrorCode(rc), QByteArray("Error during find latest. Key: ") + k + " : " + QByteArray(mdb_strerror(rc)));
         errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
     } else if (!foundValue) {
-        Error error(d->name.toLatin1(), 1, QByteArray("Key: ") + k + " : No value found");
+        Error error(d->name.toLatin1(), 1, QByteArray("Error during find latest. Key: ") + k + " : No value found");
         errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
     }
 
diff --git a/common/store.cpp b/common/store.cpp
index 4735113..1701a43 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -36,10 +36,34 @@
 #include "storage.h"
 #include "log.h"
 
+#define ASSERT_ENUMS_MATCH(A, B) Q_STATIC_ASSERT_X(static_cast<int>(A) == static_cast<int>(B), "The enum values must match");
+
+//Ensure the copied enum matches
+typedef ModelResult<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Mail::Ptr> MailModelResult;
+ASSERT_ENUMS_MATCH(Sink::Store::DomainObjectBaseRole, MailModelResult::DomainObjectBaseRole)
+ASSERT_ENUMS_MATCH(Sink::Store::ChildrenFetchedRole, MailModelResult::ChildrenFetchedRole)
+ASSERT_ENUMS_MATCH(Sink::Store::DomainObjectRole, MailModelResult::DomainObjectRole)
+ASSERT_ENUMS_MATCH(Sink::Store::StatusRole, MailModelResult::StatusRole)
+ASSERT_ENUMS_MATCH(Sink::Store::WarningRole, MailModelResult::WarningRole)
+ASSERT_ENUMS_MATCH(Sink::Store::ProgressRole, MailModelResult::ProgressRole)
+
 Q_DECLARE_METATYPE(QSharedPointer<Sink::ResultEmitter<Sink::ApplicationDomain::SinkResource::Ptr>>)
 Q_DECLARE_METATYPE(QSharedPointer<Sink::ResourceAccessInterface>);
 Q_DECLARE_METATYPE(std::shared_ptr<void>);
 
+
+static bool sanityCheckQuery(const Sink::Query &query)
+{
+    for (const auto &id : query.ids()) {
+        if (id.isEmpty()) {
+            SinkError() << "Empty id in query.";
+            return false;
+        }
+    }
+    return true;
+}
+
+
 namespace Sink {
 
 QString Store::storageLocation()
@@ -138,6 +162,7 @@ static Log::Context getQueryContext(const Sink::Query &query, const QByteArray &
 template <class DomainType>
 QSharedPointer<QAbstractItemModel> Store::loadModel(const Query &query)
 {
+    Q_ASSERT(sanityCheckQuery(query));
     auto ctx = getQueryContext(query, ApplicationDomain::getTypeName<DomainType>());
     auto model = QSharedPointer<ModelResult<DomainType, typename DomainType::Ptr>>::create(query, query.requestedProperties, ctx);
 
@@ -189,6 +214,10 @@ KAsync::Job<void> Store::create(const DomainType &domainObject)
 template <class DomainType>
 KAsync::Job<void> Store::modify(const DomainType &domainObject)
 {
+    if (domainObject.changedProperties().isEmpty()) {
+        SinkLog() << "Nothing to modify: " << domainObject.identifier();
+        return KAsync::null();
+    }
     SinkLog() << "Modify: " << domainObject;
     // Potentially move to separate thread as well
     auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
@@ -198,6 +227,10 @@ KAsync::Job<void> Store::modify(const DomainType &domainObject)
 template <class DomainType>
 KAsync::Job<void> Store::modify(const Query &query, const DomainType &domainObject)
 {
+    if (domainObject.changedProperties().isEmpty()) {
+        SinkLog() << "Nothing to modify: " << domainObject.identifier();
+        return KAsync::null();
+    }
     SinkLog() << "Modify: " << query << domainObject;
     return fetchAll<DomainType>(query)
         .each([=] (const typename DomainType::Ptr &entity) {
@@ -311,9 +344,14 @@ KAsync::Job<void> Store::synchronize(const Sink::Query &query)
 
 KAsync::Job<void> Store::synchronize(const Sink::SyncScope &scope)
 {
+    auto resourceFilter = scope.getResourceFilter();
+    //Filter resources by type by default
+    if (!resourceFilter.propertyFilter.contains(ApplicationDomain::SinkResource::Capabilities::name) && !scope.type().isEmpty()) {
+        resourceFilter.propertyFilter.insert(ApplicationDomain::SinkResource::Capabilities::name, Query::Comparator{scope.type(), Query::Comparator::Contains});
+    }
     Sink::Query query;
-    query.setFilter(scope.getResourceFilter());
-    SinkLog() << "Synchronizing: " << query;
+    query.setFilter(resourceFilter);
+    SinkLog() << "Synchronizing all resource matching: " << query;
     return fetchAll<ApplicationDomain::SinkResource>(query)
         .template each([scope](const ApplicationDomain::SinkResource::Ptr &resource) -> KAsync::Job<void> {
             return synchronize(resource->identifier(), scope);
@@ -337,6 +375,7 @@ KAsync::Job<QList<typename DomainType::Ptr>> Store::fetchAll(const Sink::Query &
 template <class DomainType>
 KAsync::Job<QList<typename DomainType::Ptr>> Store::fetch(const Sink::Query &query, int minimumAmount)
 {
+    Q_ASSERT(sanityCheckQuery(query));
     auto model = loadModel<DomainType>(query);
     auto list = QSharedPointer<QList<typename DomainType::Ptr>>::create();
     auto context = QSharedPointer<QObject>::create();
@@ -388,6 +427,7 @@ DomainType Store::readOne(const Sink::Query &query)
 template <class DomainType>
 QList<DomainType> Store::read(const Sink::Query &query_)
 {
+    Q_ASSERT(sanityCheckQuery(query_));
     auto query = query_;
     query.setFlags(Query::SynchronousQuery);
 
diff --git a/common/store.h b/common/store.h
index 34e14df..3ad547e 100644
--- a/common/store.h
+++ b/common/store.h
@@ -75,12 +75,15 @@ KAsync::Job<void> SINK_EXPORT create(const DomainType &domainObject);
  * Modify an entity.
  *
  * This includes moving etc. since these are also simple settings on a property.
+ * Note that the modification will be dropped if there is no changedProperty on the domain object.
  */
 template <class DomainType>
 KAsync::Job<void> SINK_EXPORT modify(const DomainType &domainObject);
 
 /**
  * Modify a set of entities identified by @param query.
+ * 
+ * Note that the modification will be dropped if there is no changedProperty on the domain object.
  */
 template <class DomainType>
 KAsync::Job<void> SINK_EXPORT modify(const Query &query, const DomainType &domainObject);
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 3b32e68..46d3980 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -40,7 +40,7 @@ Synchronizer::Synchronizer(const Sink::ResourceContext &context)
     mSyncStorage(Sink::storageLocation(), mResourceContext.instanceId() + ".synchronization", Sink::Storage::DataStore::DataStore::ReadWrite),
     mSyncInProgress(false)
 {
-    mCurrentState.push(ApplicationDomain::Status::OfflineStatus);
+    mCurrentState.push(ApplicationDomain::Status::NoStatus);
     SinkTraceCtx(mLogCtx) << "Starting synchronizer: " << mResourceContext.resourceType << mResourceContext.instanceId();
 }
 
@@ -344,8 +344,11 @@ void Synchronizer::setStatusFromResult(const KAsync::Error &error, const QString
         } else if (error.errorCode == ApplicationDomain::LoginError) {
             //If we failed to login altough we could connect that indicates a problem with our setup.
             setStatus(ApplicationDomain::ErrorStatus, s, requestId);
+        } else if (error.errorCode == ApplicationDomain::ConnectionLostError) {
+            //We've lost the connection so we assume the connection to the server broke.
+            setStatus(ApplicationDomain::OfflineStatus, s, requestId);
         }
-        //We don't know what kind of error this was, so we assume it's transient and don't change ou status.
+        //We don't know what kind of error this was, so we assume it's transient and don't change our status.
     } else {
         //An operation against the server worked, so we're probably online.
         setStatus(ApplicationDomain::ConnectedStatus, s, requestId);
@@ -593,17 +596,13 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
     KAsync::Job<QByteArray> job = KAsync::null<QByteArray>();
     //TODO This requires supporting every domain type here as well. Can we solve this better so we can do the dispatch somewhere centrally?
     if (type == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
-        auto folder = store().readEntity<ApplicationDomain::Folder>(key);
-        job = replay(folder, operation, oldRemoteId, modifiedProperties);
+        job = replay(store().readEntity<ApplicationDomain::Folder>(key), operation, oldRemoteId, modifiedProperties);
     } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
-        auto mail = store().readEntity<ApplicationDomain::Mail>(key);
-        job = replay(mail, operation, oldRemoteId, modifiedProperties);
+        job = replay(store().readEntity<ApplicationDomain::Mail>(key), operation, oldRemoteId, modifiedProperties);
     } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
-        auto mail = store().readEntity<ApplicationDomain::Contact>(key);
-        job = replay(mail, operation, oldRemoteId, modifiedProperties);
+        job = replay(store().readEntity<ApplicationDomain::Contact>(key), operation, oldRemoteId, modifiedProperties);
     } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>()) {
-        auto mail = store().readEntity<ApplicationDomain::Addressbook>(key);
-        job = replay(mail, operation, oldRemoteId, modifiedProperties);
+        job = replay(store().readEntity<ApplicationDomain::Addressbook>(key), operation, oldRemoteId, modifiedProperties);
     } else {
         SinkErrorCtx(mLogCtx) << "Replayed unknown type: " << type;
     }
diff --git a/dist/sink.spec b/dist/sink.spec
index f5132b7..4a4f50a 100644
--- a/dist/sink.spec
+++ b/dist/sink.spec
@@ -1,7 +1,7 @@
 
 Name:           sink
-Version:        0.3
-Release:            10%{?dist}
+Version:        0.4.0
+Release:        0%{?dist}
 Summary:        sink
 
 Group:          Applications/Desktop
@@ -17,7 +17,7 @@ BuildRequires:  kasync-devel
 BuildRequires:  kf5-kcoreaddons-devel
 BuildRequires:  kf5-kcontacts-devel
 BuildRequires:  kf5-kmime-devel
-BuildRequires:  kimap2-devel
+BuildRequires:  kimap2-devel >= 0.2
 BuildRequires:  kdav2-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libgit2-devel
diff --git a/examples/davresource/CMakeLists.txt b/examples/davresource/CMakeLists.txt
index 7091edc..2351ecd 100644
--- a/examples/davresource/CMakeLists.txt
+++ b/examples/davresource/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KPimKDAV2 REQUIRED)
 
 add_library(${PROJECT_NAME} SHARED davresource.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KPim::KDAV2)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KPim::KDAV2)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index 465220f..22c502f 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -93,7 +93,7 @@ public:
         QVector<QByteArray> ridList;
         for(const auto &f : addressbookList) {
             const auto &rid = getRid(f);
-            SinkTrace() << "Found addressbook:" << rid;
+            SinkLog() << "Found addressbook:" << rid << f.displayName();
             ridList.append(rid);
             createAddressbook(f.displayName(), rid, "");
         }
@@ -138,19 +138,21 @@ public:
                 if (error) {
                     SinkWarningCtx(mLogCtx) << "Failed to synchronize addressbooks." << collectionsFetchJob->errorString();
                 } else {
-                    synchronizeAddressbooks(collectionsFetchJob ->collections());
+                    synchronizeAddressbooks(collectionsFetchJob->collections());
                 }
             });
             return job;
         } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
             SinkLogCtx(mLogCtx) << "Synchronizing contacts.";
             auto ridList = QSharedPointer<QByteArrayList>::create();
+            auto total = QSharedPointer<int>::create(0);
+            auto progress = QSharedPointer<int>::create(0);
             auto collectionsFetchJob = new KDAV2::DavCollectionsFetchJob(mResourceUrl);
             auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] {
                 synchronizeAddressbooks(collectionsFetchJob ->collections());
                 return collectionsFetchJob->collections();
             })
-            .serialEach([this, ridList](const KDAV2::DavCollection &collection) {
+            .serialEach([=](const KDAV2::DavCollection &collection) {
                 auto collId = getRid(collection);
                 const auto addressbookLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, collId);
                 auto ctag = collection.CTag().toLatin1();
@@ -158,10 +160,11 @@ public:
                     SinkTraceCtx(mLogCtx) << "Syncing " << collId;
                     auto cache = std::shared_ptr<KDAV2::EtagCache>(new KDAV2::EtagCache());
                     auto davItemsListJob = new KDAV2::DavItemsListJob(collection.url(), cache);
-                    const QByteArray bufferType = ENTITY_TYPE_CONTACT;
                     QHash<QByteArray, Query::Comparator> mergeCriteria;
-                    auto colljob = runJob(davItemsListJob).then([davItemsListJob] {
-                        return KAsync::value(davItemsListJob->items());
+                    auto colljob = runJob(davItemsListJob).then([=] {
+                        const auto items = davItemsListJob->items();
+                        *total = items.size();
+                        return KAsync::value(items);
                     })
                     .serialEach([=] (const KDAV2::DavItem &item) {
                         QByteArray rid = getRid(item);
@@ -175,13 +178,19 @@ public:
                                 Sink::ApplicationDomain::Contact contact;
                                 contact.setVcard(item.data());
                                 contact.setAddressbook(addressbookLocalId);
-                                createOrModify(bufferType, rid, contact, mergeCriteria);
+                                createOrModify(ENTITY_TYPE_CONTACT, rid, contact, mergeCriteria);
                                 return item;
                             })
-                            .then([this, ridList] (const KDAV2::DavItem &item) {
+                            .then([=] (const KDAV2::DavItem &item) {
                                 const auto rid = getRid(item);
                                 syncStore().writeValue(rid + "_etag", item.etag().toLatin1());
                                 ridList->append(rid);
+                                *progress += 1;
+                                reportProgress(*progress, *total, QByteArrayList{} << addressbookLocalId);
+                                //commit every 5 contacts (so contacts start appearing in the UI)
+                                if ((*progress % 5) == 0) {
+                                    commit();
+                                }
                                 return rid;
                             });
                             return itemjob;
@@ -190,7 +199,7 @@ public:
                             return KAsync::value(rid);
                         }
                     })
-                    .then([this, collId, ctag] () {
+                    .then([=] () {
                         syncStore().writeValue(collId + "_ctag", ctag);
                     });
                     return colljob;
@@ -251,6 +260,7 @@ DavResourceFactory::DavResourceFactory(QObject *parent)
     : Sink::ResourceFactory(parent,
             {Sink::ApplicationDomain::ResourceCapabilities::Contact::contact,
             Sink::ApplicationDomain::ResourceCapabilities::Contact::addressbook,
+            Sink::ApplicationDomain::ResourceCapabilities::Contact::storage
             }
             )
 {
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 2bbaa47..62e96f1 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(${PROJECT_NAME} SHARED resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/imapresource/CMakeLists.txt b/examples/imapresource/CMakeLists.txt
index 5d2d38b..f5f51f8 100644
--- a/examples/imapresource/CMakeLists.txt
+++ b/examples/imapresource/CMakeLists.txt
@@ -9,8 +9,7 @@ find_package(KIMAP2 0.2 REQUIRED)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(${PROJECT_NAME} SHARED imapresource.cpp imapserverproxy.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime KIMAP2)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KF5::Mime KIMAP2)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 81c808b..3ae7fd7 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -511,6 +511,8 @@ public:
                     return {ApplicationDomain::LoginError, error.errorMessage};
                 case Imap::HostNotFoundError:
                     return {ApplicationDomain::NoServerError, error.errorMessage};
+                case Imap::ConnectionLost:
+                    return {ApplicationDomain::ConnectionLostError, error.errorMessage};
                 default:
                     return {ApplicationDomain::UnknownError, error.errorMessage};
             }
@@ -619,6 +621,15 @@ public:
 
     KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
     {
+        if (operation != Sink::Operation_Creation) {
+            if(oldRemoteId.isEmpty()) {
+                // return KAsync::error<QByteArray>("Tried to replay modification without old remoteId.");
+                qWarning() << "Tried to replay modification without old remoteId.";
+                // Since we can't recover from the situation we just skip over the revision.
+                // FIXME figure out how we can ever end up in this situation
+                return KAsync::null<QByteArray>();
+            }
+        }
         auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort, &mSessionCache);
         auto login = imap->login(mUser, mPassword);
         KAsync::Job<QByteArray> job = KAsync::null<QByteArray>();
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 538105c..5c2e07c 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -61,6 +61,21 @@ const char* Imap::Capabilities::Namespace = "NAMESPACE";
 const char* Imap::Capabilities::Uidplus = "UIDPLUS";
 const char* Imap::Capabilities::Condstore = "CONDSTORE";
 
+static int translateImapError(int error)
+{
+    switch (error) {
+        case KJob::UserDefinedError:
+            return Imap::ConnectionLost;
+        case KIMAP2::LoginJob::ErrorCode::ERR_HOST_NOT_FOUND:
+            return Imap::HostNotFoundError;
+        case KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT:
+            return Imap::CouldNotConnectError;
+        case KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED:
+            return Imap::SslHandshakeError;
+    }
+    return Imap::UnknownError;
+}
+
 template <typename T>
 static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
 {
@@ -69,7 +84,8 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
             SinkTrace() << "Job done: " << job->metaObject()->className();
             if (job->error()) {
                 SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
-                future.setError(job->error(), job->errorString());
+                auto proxyError = translateImapError(job->error());
+                future.setError(proxyError, job->errorString());
             } else {
                 future.setValue(f(job));
                 future.setFinished();
@@ -87,7 +103,8 @@ static KAsync::Job<void> runJob(KJob *job)
             SinkTrace() << "Job done: " << job->metaObject()->className();
             if (job->error()) {
                 SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
-                future.setError(job->error(), job->errorString());
+                auto proxyError = translateImapError(job->error());
+                future.setError(proxyError, job->errorString());
             } else {
                 future.setFinished();
             }
@@ -166,20 +183,6 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
         // SinkTrace() << "Found personal namespaces: " << mNamespaces.personal;
         // SinkTrace() << "Found shared namespaces: " << mNamespaces.shared;
         // SinkTrace() << "Found user namespaces: " << mNamespaces.user;
-    }).then([=] (const KAsync::Error &error) {
-        if (error) {
-            switch (error.errorCode) {
-            case KIMAP2::LoginJob::ErrorCode::ERR_HOST_NOT_FOUND:
-                return KAsync::error(HostNotFoundError, "Host not found: " + error.errorMessage);
-            case KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT:
-                return KAsync::error(CouldNotConnectError, "Failed to connect: " + error.errorMessage);
-            case KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED:
-                return KAsync::error(SslHandshakeError, "Ssl handshake failed: " + error.errorMessage);
-            default:
-                return KAsync::error(error);
-            }
-        }
-        return KAsync::null();
     });
 }
 
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 82f4f58..f9b854b 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -33,7 +33,9 @@ enum ErrorCode {
     NoError,
     HostNotFoundError,
     CouldNotConnectError,
-    SslHandshakeError
+    SslHandshakeError,
+    ConnectionLost,
+    UnknownError
 };
 
 namespace Flags
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index a8f0359..690817e 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -6,8 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KF5 COMPONENTS REQUIRED Mime)
 
 add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp libmaildir/maildir.cpp libmaildir/keycache.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KF5::Mime)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/examples/mailtransportresource/CMakeLists.txt b/examples/mailtransportresource/CMakeLists.txt
index 03b89db..1c34676 100644
--- a/examples/mailtransportresource/CMakeLists.txt
+++ b/examples/mailtransportresource/CMakeLists.txt
@@ -10,13 +10,23 @@ include_directories(${CURL_INCLUDE_DIRS})
 
 
 add_library(${PROJECT_NAME} SHARED mailtransportresource.cpp mailtransport.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime ${CURL_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}
+    sink
+    Qt5::Core
+    Qt5::Network
+    KF5::Mime
+    ${CURL_LIBRARIES}
+)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
 add_executable(sink_smtp_test smtptest.cpp mailtransport.cpp)
-qt5_use_modules(sink_smtp_test Core Network)
-target_link_libraries(sink_smtp_test sink KF5::Mime ${CURL_LIBRARIES})
+target_link_libraries(sink_smtp_test
+    sink
+    Qt5::Core
+    Qt5::Network
+    KF5::Mime
+    ${CURL_LIBRARIES}
+)
 install(TARGETS sink_smtp_test ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory(tests)
diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt
index bc487c1..cd12c16 100644
--- a/sinksh/CMakeLists.txt
+++ b/sinksh/CMakeLists.txt
@@ -19,6 +19,7 @@ set(sink_cli_SRCS
     syntax_modules/sink_inspect.cpp
     syntax_modules/sink_drop.cpp
     syntax_modules/sink_upgrade.cpp
+    syntax_modules/sink_info.cpp
     sinksh_utils.cpp
     repl/repl.cpp
     repl/replStates.cpp
diff --git a/sinksh/syntax_modules/sink_info.cpp b/sinksh/syntax_modules/sink_info.cpp
new file mode 100644
index 0000000..aa515e6
--- /dev/null
+++ b/sinksh/syntax_modules/sink_info.cpp
@@ -0,0 +1,51 @@
+/*
+ *   Copyright (C) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+
+#include <QDebug>
+#include <QObject> // tr()
+
+#include "common/definitions.h"
+
+#include "sinksh_utils.h"
+#include "state.h"
+#include "syntaxtree.h"
+#include "sink_version.h"
+
+namespace SinkInfo
+{
+
+bool info(const QStringList &args, State &state)
+{
+    state.printLine(QString("Sink version: %1").arg(sink_VERSION_STRING));
+    state.printLine(QString("Storage location: %1").arg(Sink::storageLocation()));
+    state.printLine(QString("Data location: %1").arg(Sink::dataLocation()));
+    state.printLine(QString("Config location: %1").arg(Sink::configLocation()));
+    state.printLine(QString("Temporary file location: %1").arg(Sink::temporaryFileLocation()));
+    state.printLine(QString("Resource storage location: %1").arg(Sink::resourceStorageLocation("$RESOURCE")));
+    return false;
+}
+
+Syntax::List syntax()
+{
+    return Syntax::List() << Syntax{"info", QObject::tr("Shows general system info"), &SinkInfo::info, Syntax::NotInteractive};
+}
+
+REGISTER_SYNTAX(SinkInfo)
+
+}
diff --git a/sinksh/syntax_modules/sink_inspect.cpp b/sinksh/syntax_modules/sink_inspect.cpp
index a8a3805..da62250 100644
--- a/sinksh/syntax_modules/sink_inspect.cpp
+++ b/sinksh/syntax_modules/sink_inspect.cpp
@@ -19,8 +19,6 @@
 
 #include <QDebug>
 #include <QObject> // tr()
-#include <QTimer>
-#include <QDir>
 
 #include "common/resource.h"
 #include "common/storage.h"
@@ -30,6 +28,7 @@
 #include "common/definitions.h"
 #include "common/entitybuffer.h"
 #include "common/metadata_generated.h"
+#include "common/bufferutils.h"
 
 #include "sinksh_utils.h"
 #include "state.h"
@@ -41,7 +40,7 @@ namespace SinkInspect
 bool inspect(const QStringList &args, State &state)
 {
     if (args.isEmpty()) {
-        state.printError(QObject::tr("Options: $type [--resource $resource] [--db $db] [--filter $id] [--showinternal]"));
+        state.printError(QObject::tr("Options: [--resource $resource] ([--db $db] [--filter $id] [--showinternal] | [--validaterids $type])"));
     }
     auto options = SyntaxTree::parseOptions(args);
     auto resource = options.options.value("resource").value(0);
@@ -49,6 +48,75 @@ bool inspect(const QStringList &args, State &state)
     Sink::Storage::DataStore storage(Sink::storageLocation(), resource, Sink::Storage::DataStore::ReadOnly);
     auto transaction = storage.createTransaction(Sink::Storage::DataStore::ReadOnly);
 
+    bool validateRids = options.options.contains("validaterids");
+    if (validateRids) {
+        if (options.options.value("validaterids").isEmpty()) {
+            state.printError(QObject::tr("Specify a type to validate."));
+            return false;
+        }
+        auto type = options.options.value("validaterids").first().toUtf8();
+        /*
+         * Try to find all rid's for all uid's.
+         * If we have entities without rid's that either means we have only created it locally or that we have a problem.
+         */
+        Sink::Storage::DataStore syncStore(Sink::storageLocation(), resource + ".synchronization", Sink::Storage::DataStore::ReadOnly);
+        auto syncTransaction = syncStore.createTransaction(Sink::Storage::DataStore::ReadOnly);
+
+        auto db = transaction.openDatabase(type + ".main",
+                [&] (const Sink::Storage::DataStore::Error &e) {
+                    Q_ASSERT(false);
+                    state.printError(e.message);
+                }, false);
+
+        auto ridMap = syncTransaction.openDatabase("localid.mapping." + type,
+                [&] (const Sink::Storage::DataStore::Error &e) {
+                    Q_ASSERT(false);
+                    state.printError(e.message);
+                }, false);
+
+        QHash<QByteArray, QByteArray> hash;
+
+        ridMap.scan("", [&] (const QByteArray &key, const QByteArray &data) {
+                    hash.insert(key, data);
+                    return true;
+                },
+                [&](const Sink::Storage::DataStore::Error &e) {
+                    state.printError(e.message);
+                },
+                false);
+
+        QSet<QByteArray> uids;
+        db.scan("", [&] (const QByteArray &key, const QByteArray &data) {
+                    uids.insert(Sink::Storage::DataStore::uidFromKey(key));
+                    return true;
+                },
+                [&](const Sink::Storage::DataStore::Error &e) {
+                    state.printError(e.message);
+                },
+                false);
+
+        int missing = 0;
+        for (const auto &uid : uids) {
+            if (!hash.remove(uid)) {
+                missing++;
+                qWarning() << "Failed to find RID for " << uid;
+            }
+        }
+        if (missing) {
+            qWarning() << "Found a total of " << missing << " missing rids";
+        }
+
+        //If we still have items in the hash it means we have rid mappings for entities
+        //that no longer exist.
+        if (!hash.isEmpty()) {
+            qWarning() << "Have rids left: " << hash.size();
+        } else if (!missing) {
+            qWarning() << "Everything is in order.";
+        }
+
+        return false;
+    }
+
     auto dbs = options.options.value("db");
     auto idFilter = options.options.value("filter");
     bool showInternal = options.options.contains("showinternal");
@@ -96,7 +164,10 @@ bool inspect(const QStringList &args, State &state)
                             state.printError("Read invalid buffer from disk: " + key);
                         } else {
                             const auto metadata = flatbuffers::GetRoot<Sink::Metadata>(buffer.metadataBuffer());
-                            state.printLine("Key: " + key + " Operation: " + QString::number(metadata->operation()));
+                            state.printLine("Key: " + key
+                                          + " Operation: " + QString::number(metadata->operation())
+                                          + " Replay: " + (metadata->replayToSource() ? "true" : "false")
+                                          + ((metadata->modifiedProperties() && metadata->modifiedProperties()->size() != 0) ? (" [" + Sink::BufferUtils::fromVector(*metadata->modifiedProperties()).join(", ")) + "]": ""));
                         }
                     } else {
                         state.printLine("Key: " + key + " Value: " + QString::fromUtf8(data));
diff --git a/sinksh/syntax_modules/sink_show.cpp b/sinksh/syntax_modules/sink_show.cpp
index 391505a..7a4166f 100644
--- a/sinksh/syntax_modules/sink_show.cpp
+++ b/sinksh/syntax_modules/sink_show.cpp
@@ -18,18 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QObject> // tr()
 #include <QModelIndex>
 #include <QTime>
 
-#include "common/resource.h"
 #include "common/storage.h"
-#include "common/resourceconfig.h"
-#include "common/log.h"
-#include "common/storage.h"
-#include "common/definitions.h"
 
 #include "sinksh_utils.h"
 #include "state.h"
@@ -41,25 +35,24 @@ namespace SinkShow
 bool show(const QStringList &args, State &state)
 {
     if (args.isEmpty()) {
-        state.printError(QObject::tr("Please provide at least one type to show (e.g. resource, .."));
+        state.printError(QObject::tr("Options: $type --resource $resource --id $id"));
         return false;
     }
 
-    auto argList = args;
-    if (argList.size() < 2 || !SinkshUtils::isValidStoreType(argList.at(0))) {
+    auto options = SyntaxTree::parseOptions(args);
+
+    auto type = options.positionalArguments.isEmpty() ? QString{} : options.positionalArguments.first();
+    auto resource = options.options.value("resource");
+    auto id = options.options.value("id");
+
+    if (id.isEmpty() || resource.isEmpty() || !SinkshUtils::isValidStoreType(type)) {
         state.printError(QObject::tr("Invalid command syntax. Supply type and resource at least."));
         return false;
     }
-    auto type = argList.takeFirst();
-    auto resource = argList.takeFirst();
-    bool queryForResourceOrAgent = argList.isEmpty();
 
     Sink::Query query;
-    if (queryForResourceOrAgent) {
-        query.filter(resource.toLatin1());
-    } else {
-        query.resourceFilter(resource.toLatin1());
-    }
+    query.resourceFilter(resource.first().toLatin1());
+    query.filter(id.first().toLatin1());
 
     QTime time;
     time.start();
diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt
index e049d64..2f8b128 100644
--- a/synchronizer/CMakeLists.txt
+++ b/synchronizer/CMakeLists.txt
@@ -7,6 +7,11 @@ set(sinksynchronizer_SRCS
 )
 
 add_executable(${PROJECT_NAME} ${sinksynchronizer_SRCS})
-target_link_libraries(${PROJECT_NAME} sink KAsync ${CMAKE_DL_LIBS})
-qt5_use_modules(${PROJECT_NAME} Core Network)
+target_link_libraries(${PROJECT_NAME}
+    sink
+    Qt5::Core
+    Qt5::Network
+    KAsync
+    ${CMAKE_DL_LIBS}
+)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b3e7b1..6a757ca 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,12 +9,19 @@ include_directories(
     )
 
 add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/data")
+add_definitions(-DTHREADTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/threaddata")
 
 find_package(KF5 COMPONENTS REQUIRED Mime)
 
 add_library(sink_test SHARED testimplementations.cpp getrssusage.cpp mailtest.cpp mailsynctest.cpp mailthreadtest.cpp)
-qt5_use_modules(sink_test Core Test Concurrent)
-target_link_libraries(sink_test sink libhawd KF5::Mime)
+target_link_libraries(sink_test
+    sink
+    libhawd
+    Qt5::Core
+    Qt5::Concurrent
+    Qt5::Test
+    KF5::Mime
+)
 
 add_executable(dbwriter dbwriter.cpp)
 target_link_libraries(dbwriter sink)
diff --git a/tests/SinkTest.cmake b/tests/SinkTest.cmake
index 03076e7..4eb8f43 100644
--- a/tests/SinkTest.cmake
+++ b/tests/SinkTest.cmake
@@ -17,8 +17,13 @@ macro(auto_tests)
         add_executable(${_testname} ${_testname}.cpp)
         add_test(${_testname} ${_testname})
         add_memcheck_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd sink_test)
+        target_link_libraries(${_testname}
+            sink libhawd
+            sink_test
+            Qt5::Core
+            Qt5::Concurrent
+            Qt5::Test
+        )
     endforeach(_testname)
 endmacro(auto_tests)
 
@@ -26,7 +31,13 @@ macro(manual_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp)
         add_memcheck_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd sink_test)
+        target_link_libraries(${_testname}
+            sink
+            libhawd
+            sink_test
+            Qt5::Core
+            Qt5::Concurrent
+            Qt5::Test
+        )
     endforeach(_testname)
 endmacro(manual_tests)
diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index 0ab18ef..2eee9f9 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -139,7 +139,7 @@ private slots:
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkAccount>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
             auto account = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>();
-            QCOMPARE(account->getStatus(), static_cast<int>(Sink::ApplicationDomain::OfflineStatus));
+            QCOMPARE(account->getStatus(), static_cast<int>(Sink::ApplicationDomain::NoStatus));
 
             //Synchronize to connect
             VERIFYEXEC(Sink::Store::synchronize(Query().resourceFilter(res.identifier())));
@@ -148,6 +148,40 @@ private slots:
         }
     }
 
+    void testLoadAccountStatusLive()
+    {
+        using namespace Sink;
+        using namespace Sink::ApplicationDomain;
+
+        {
+            //Create a live query for all accounts
+            Sink::Query query;
+            query.setFlags(Query::LiveQuery);
+            query.request<Sink::ApplicationDomain::SinkAccount::Status>();
+
+            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkAccount>(query);
+
+            //Create the account
+            auto account = ApplicationDomainType::createEntity<SinkAccount>();
+            account.setAccountType("dummy");
+            account.setName("name");
+            VERIFYEXEC(Store::create(account));
+
+            auto res = Sink::ApplicationDomain::DummyResource::create(account.identifier());
+            VERIFYEXEC(Sink::Store::create(res));
+
+            //Ensure the account was created
+            QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
+            auto retrievedAccount = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>();
+            QCOMPARE(retrievedAccount->getStatus(), static_cast<int>(Sink::ApplicationDomain::NoStatus));
+
+            //Synchronize to connect and ensure we receive the update
+            VERIFYEXEC(Sink::Store::synchronize(Query().resourceFilter(res.identifier())));
+
+            QTRY_COMPARE_WITH_TIMEOUT(model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>()->getStatus(), static_cast<int>(Sink::ApplicationDomain::ConnectedStatus), 1000);
+        }
+    }
+
 };
 
 QTEST_GUILESS_MAIN(AccountsTest)
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 3955ebd..7e348c2 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -360,6 +360,8 @@ private slots:
         auto event = Sink::ApplicationDomain::Event::createEntity<Sink::ApplicationDomain::Event>("dummyresource.instance1");
         Sink::Store::create(event).exec().waitForFinished();
         QCOMPARE(facade->creations.size(), 1);
+        //Modify something so the mdofication won't be dropped
+        event.setSummary("foobar");
         Sink::Store::modify(event).exec().waitForFinished();
         QCOMPARE(facade->modifications.size(), 1);
         Sink::Store::remove(event).exec().waitForFinished();
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 6ae5f13..7546920 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -27,8 +27,7 @@ set(SRCS
 
 add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS})
 generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
-qt5_use_modules(lib${PROJECT_NAME} Core)
-target_link_libraries(lib${PROJECT_NAME} sink)
+target_link_libraries(lib${PROJECT_NAME} sink Qt5::Core)
 if (LIBGIT2_FOUND)
    target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
@@ -36,8 +35,7 @@ endif(LIBGIT2_FOUND)
 install(TARGETS lib${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_executable(${PROJECT_NAME} ${SRCS})
-qt5_use_modules(${PROJECT_NAME} Core)
-target_link_libraries(${PROJECT_NAME} lib${PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME} lib${PROJECT_NAME} Qt5::Core)
 if (LIBGIT2_FOUND)
    target_link_libraries(${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index cbb56d5..93d3ce3 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -328,6 +328,15 @@ void MailTest::testMarkMailAsRead()
             return KAsync::null<void>();
         });
     VERIFYEXEC(job2);
+
+    //Verify we can mark the mail as unread again
+    {
+        auto readMail = Store::readOne<Mail>(Query{mail});
+        readMail.setUnread(true);
+        VERIFYEXEC(Store::modify(readMail));
+        VERIFYEXEC(ResourceControl::flushReplayQueue(mResourceInstanceIdentifier));
+        VERIFYEXEC(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(readMail, Mail::Unread::name, true)));
+    }
 }
 
 void MailTest::testCreateDraft()
diff --git a/tests/mailthreadtest.cpp b/tests/mailthreadtest.cpp
index 741eb78..9ed5d83 100644
--- a/tests/mailthreadtest.cpp
+++ b/tests/mailthreadtest.cpp
@@ -21,6 +21,7 @@
 #include <QtTest>
 
 #include <QString>
+#include <QFile>
 #include <KMime/Message>
 
 #include "store.h"
@@ -185,4 +186,67 @@ void MailThreadTest::testIndexInMixedOrder()
     /* VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier)); */
 }
 
+static QByteArray readMailFromFile(const QString &mailFile)
+{
+    QFile file(QLatin1String(THREADTESTDATAPATH) + QLatin1Char('/') + mailFile);
+    file.open(QIODevice::ReadOnly);
+    Q_ASSERT(file.isOpen());
+    return file.readAll();
+}
+
+static KMime::Message::Ptr readMail(const QString &mailFile)
+{
+    auto msg = KMime::Message::Ptr::create();
+    msg->setContent(readMailFromFile(mailFile));
+    msg->parse();
+    return msg;
+}
+
+void MailThreadTest::testRealWorldThread()
+{
+    auto folder = Folder::create(mResourceInstanceIdentifier);
+    folder.setName("folder");
+    VERIFYEXEC(Store::create(folder));
+
+    auto createMail = [this, folder] (KMime::Message::Ptr msg) {
+        auto mail = Mail::create(mResourceInstanceIdentifier);
+        mail.setMimeMessage(msg->encodedContent(true));
+        mail.setFolder(folder);
+        VERIFYEXEC(Store::create(mail));
+    };
+
+    createMail(readMail("thread1"));
+
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+    auto query = Sink::StandardQueries::threadLeaders(folder);
+    query.resourceFilter(mResourceInstanceIdentifier);
+    query.request<Mail::Subject>().request<Mail::MimeMessage>().request<Mail::Folder>().request<Mail::Date>();
+
+    //Ensure we find the thread leader
+    Mail threadLeader = [&] {
+        auto mails = Store::read<Mail>(query);
+        Q_ASSERT(mails.size() == 1);
+        return mails.first();
+    }();
+
+    createMail(readMail("thread2"));
+    createMail(readMail("thread3"));
+    createMail(readMail("thread4"));
+    createMail(readMail("thread5"));
+    createMail(readMail("thread6"));
+    createMail(readMail("thread7"));
+    createMail(readMail("thread8")); //This mail is breaking the thread
+    VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+
+    //Ensure the thread is complete
+    {
+        auto query = Sink::StandardQueries::completeThread(threadLeader);
+        query.request<Mail::Subject>().request<Mail::MimeMessage>().request<Mail::Folder>().request<Mail::Date>();
+
+        auto mails = Store::read<Mail>(query);
+        QCOMPARE(mails.size(), 8);
+    }
+}
+
 #include "mailthreadtest.moc"
diff --git a/tests/mailthreadtest.h b/tests/mailthreadtest.h
index 8730ec6..1c5c389 100644
--- a/tests/mailthreadtest.h
+++ b/tests/mailthreadtest.h
@@ -52,6 +52,7 @@ private slots:
 
     void testListThreadLeader();
     void testIndexInMixedOrder();
+    void testRealWorldThread();
 };
 
 }
diff --git a/tests/notificationtest.cpp b/tests/notificationtest.cpp
index f0d957e..c043f38 100644
--- a/tests/notificationtest.cpp
+++ b/tests/notificationtest.cpp
@@ -128,13 +128,41 @@ private slots:
         VERIFYEXEC(Sink::Store::synchronize(newQuery));
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
 
-        QCOMPARE(status.size(), 3);
+        QTRY_COMPARE(status.size(), 3);
         //Sync progress of item
         QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
-        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
         //Modification triggered during sync
         QCOMPARE(status.at(2), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
     }
+
+    void testNotifier()
+    {
+        QList<int> status;
+        Sink::Notifier notifier{Sink::Query{Sink::Query::LiveQuery}.resourceFilter("sink.dummy.instance2")};
+        notifier.registerHandler([&] (const Sink::Notification &notification) {
+            if (notification.type == Notification::Info) {
+                status << notification.code;
+            }
+        });
+
+        auto query = Query().resourceFilter("sink.dummy.instance2");
+        query.setType<ApplicationDomain::Mail>();
+        query.setFlags(Query::LiveQuery | Query::UpdateStatus);
+
+        auto resource = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::SinkResource>("", "sink.dummy.instance2");
+        resource.setResourceType("sink.dummy");
+        VERIFYEXEC(Store::create(resource));
+
+        VERIFYEXEC(Sink::Store::synchronize(query));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance2"));
+
+        QTRY_COMPARE(status.size(), 2);
+        //Sync progress of item
+        QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+    }
+
 };
 
 QTEST_MAIN(NotificationTest)
diff --git a/tests/resourceconfigtest.cpp b/tests/resourceconfigtest.cpp
index df98a61..78a0d4c 100644
--- a/tests/resourceconfigtest.cpp
+++ b/tests/resourceconfigtest.cpp
@@ -91,7 +91,7 @@ private slots:
             auto model = Sink::Store::loadModel<SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
             auto resource = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<SinkResource::Ptr>();
-            QCOMPARE(resource->getStatus(), static_cast<int>(OfflineStatus));
+            QCOMPARE(resource->getStatus(), static_cast<int>(NoStatus));
 
             //Synchronize to connect
             VERIFYEXEC(Sink::Store::synchronize(query));
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index 9e9bad9..3368549 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -542,6 +542,35 @@ private slots:
         }
 
     }
+
+    void testRecordUid()
+    {
+        Sink::Storage::DataStore store(testDataPath, dbName, Sink::Storage::DataStore::ReadWrite);
+        auto transaction = store.createTransaction(Sink::Storage::DataStore::ReadWrite);
+        Sink::Storage::DataStore::recordUid(transaction, "uid1", "type");
+        Sink::Storage::DataStore::recordUid(transaction, "uid2", "type");
+        Sink::Storage::DataStore::recordUid(transaction, "uid3", "type2");
+
+        {
+            QVector<QByteArray> uids;
+            Sink::Storage::DataStore::getUids("type", transaction, [&](const QByteArray &r) {
+                uids << r;
+            });
+            QVector<QByteArray> expected{{"uid1"}, {"uid2"}};
+            QCOMPARE(uids, expected);
+        }
+
+        Sink::Storage::DataStore::removeUid(transaction, "uid2", "type");
+
+        {
+            QVector<QByteArray> uids;
+            Sink::Storage::DataStore::getUids("type", transaction, [&](const QByteArray &r) {
+                uids << r;
+            });
+            QVector<QByteArray> expected{{"uid1"}};
+            QCOMPARE(uids, expected);
+        }
+    }
 };
 
 QTEST_MAIN(StorageTest)
diff --git a/tests/threaddata/thread1 b/tests/threaddata/thread1
new file mode 100644
index 0000000..8b72901
--- /dev/null
+++ b/tests/threaddata/thread1
@@ -0,0 +1,228 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Sun, 13 Aug 2017 11:50:30 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx002.mykolab.com (unknown [10.9.13.2])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id E79C512C084C4
+        for <christian@mailqueue.ch>; Sun, 13 Aug 2017 11:50:29 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.1])
+        by int-mx002.mykolab.com (Postfix) with ESMTPS id BE41F2329
+        for <christian@mailqueue.ch>; Sun, 13 Aug 2017 11:50:29 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in001.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward2-smtp.messagingengine.com (forward2-smtp.messagingengine.com [66.111.4.226])
+        by ext-mx-in001.mykolab.com (Postfix) with ESMTPS id 5614B11BB
+        for <christian@mailqueue.ch>; Sun, 13 Aug 2017 11:50:08 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id E9026D1C6
+        for <christian@mailqueue.ch>; Sun, 13 Aug 2017 05:50:06 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id D95328E3AC; Sun, 13 Aug 2017 05:50:06 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Sun, 13 Aug 2017 05:50:06 -0400
+X-Cyrus-Session-Id: sloti36d2t28-2961984-1502617806-2-9300763073201928650
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_20 -0.001, RCVD_IN_DNSWL_MED -2.3, RP_MATCHES_RCVD -0.001,
+  SPF_PASS -0.001, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Attached: signature.asc
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx4 ([10.202.2.203])
+  by compute1.internal (LMTPProxy); Sun, 13 Aug 2017 05:50:06 -0400
+Authentication-Results: mx4.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=aAtxmD+3;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    smime=temperror;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx4.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx4.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Sun, 13 Aug 2017 05:50:05 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502617803; bh=IzJP1FRz6gX2xTBV2xMDBc2KfNLK284LvmfZvBQHRwU=;
+        h=From:To:Subject:Date:Reply-To:List-Id:List-Unsubscribe:
+         List-Archive:List-Post:List-Help:List-Subscribe:From;
+        b=aAtxmD+3cXY913YngN6okQjxPwOn+T9Cw1Hl1NpSZ2E4VbNDeuQ9IVj6zCqeAZE6y
+         elk2GquLeHlXeLnygo2n5LQL6epM83pkS+1AWSHQI11mBDT5byLUrXX64hOSZ579jG
+         L6+jAJT8vcqnXZcGg5EjBQqYmFp4HLedW/xduUVg=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Neutral (access neither permitted nor denied) identity=mailfrom;
+ client-ip=85.214.75.115; helo=h2670809.stratoserver.net;
+ envelope-from=vkrause@kde.org; receiver=kde-community@kde.org 
+Received: from h2670809.stratoserver.net (deltatauchi.de [85.214.75.115])
+ by postbox.kde.org (Postfix) with ESMTP id 61C21A308E
+ for <kde-community@kde.org>; Sun, 13 Aug 2017 09:49:38 +0000 (UTC)
+Received: from deltatauchi.de (ip5b403802.dynamic.kabel-deutschland.de
+ [91.64.56.2])
+ by h2670809.stratoserver.net (Postfix) with ESMTPSA id 521BBF1A0104
+ for <kde-community@kde.org>; Sun, 13 Aug 2017 11:49:07 +0200 (CEST)
+From: Volker Krause <vkrause@kde.org>
+To: kde-community@kde.org
+Subject: Telemetry Policy
+Date: Sun, 13 Aug 2017 11:47:28 +0200
+Message-ID: <2048912.XfIJe3ZSdj@vkpc5>
+Organization: KDE
+X-Face: rgzmh}R?iq<z7H#sc'l86vzjJ"{\d6`}N5x*9!HFBn`A^tnU?<Q%ruT(jt5PG1$td=GDXe
+ XsXW(lVZ%Z0.2|w-)y[+@HI})\pNZEMi/UY_D";
+ tt:5C'5&O9_xAqO!$HA8Ks-5}uMz%`D "2{s`Mt$}N]I`0UI=0;
+ '4v"!]XgBET9Q%cB?\vr#1=5X3,[a3k@083{n9H0m~Ey5_5xOb; @06MoJe"3/Rfe[eki
+MIME-Version: 1.0
+Content-Type: multipart/signed; boundary="nextPart1627232.ab0ruIHapE";
+ micalg="pgp-sha1"; protocol="application/pgp-signature"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+--nextPart1627232.ab0ruIHapE
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+
+Hi,
+
+during the KUserFeedback BoF at Akademy there was quite some interest in 
+collecting telemetry data in KDE applications. But before actually 
+implementing that we agreed to define the rules under which we would want to 
+do that. I've tried to put the input we collected during Akademy into proper 
+wording below. What do you think? Did I miss anything?
+
+Regards,
+Volker
+
+
+# Telemetry Policy Draft
+
+Application telemetry data can be a valuable tool for tailoring our products 
+to the needs of our users. The following rules define how KDE collects and 
+uses such application telemetry data. As privacy is of utmost importance to 
+us, the general rule of thumb is to err on the side of caution here. Privacy 
+always trumps any need for telemetry data, no matter how legitimate.
+
+These rules apply to all products released by KDE.
+
+## Transparency
+
+We provide detailed information about the data that is going to be shared, in 
+a way that:
+- is easy to understand
+- is precise and complete
+- is available locally without network connectivity
+
+Any changes or additions to the telemetry functionality of an application will 
+be highlighted in the corresponding release announcement.
+
+## Control
+
+We give the user full control over what data they want to share with KDE. In 
+particular:
+- application telemetry is always opt-in, that is off by default
+- application telemetry settings can be changed at any time, and are provided 
+as prominent in the application interface as other application settings
+- applications honor system-wide telemetry settings where they exist (global 
+"kill switch")
+- we provide detailed documentation about how to control the application 
+telemetry system
+
+In order to ensure control over the data after it has been shared with KDE, 
+applications will only transmit this data to KDE servers, that is servers 
+under the full control of the KDE sysadmin team.
+
+We will provide a designated contact point for users who have concerns about 
+the data they have shared with KDE. While we are willing to delete data a user 
+no longer wants to have shared, it should be understood that the below rules 
+are designed to make identification of data of a specific user impossible, and 
+thus a deletion request impractical.
+
+## Anonymity
+
+We do not transmit data that could be used to identify a specific user. In 
+particular:
+- we will not use any unique device, installation or user id
+- data is stripped of any unnecessary detail and downsampled appropriately 
+before sharing to avoid fingerprinting
+- network addresses (which are exposed inevitably as part of the data 
+transmission) are not stored together with the telemetry data, and must only 
+be stored or used to the extend necessary for abuse counter-measures
+
+## Minimalism
+
+We only track the bare minimum of data necessary to answer specific questions, 
+we do not collect data preemptively or for exploratory research. In 
+particular, this means:
+- collected data  must have a clear purpose
+- data is downsampled to the maximum extend possible at the source
+- relevant correlations between individual bits of data should be computed at 
+the source whenever possible
+- data collection is stopped once corresponding question has been answered
+
+## Privacy
+
+We will never transmit anything containing user content, or even just hints at 
+possible user content such as e.g. file names, URLs, etc.
+
+We will only ever track:
+- system information that are specific to the installation/environment, but 
+independent of how the application/machine/installation is actually used
+- statistical usage data of an installation/application
+
+## Compliance
+
+KDE only releases products capable of acquiring telemetry data if compliance 
+with these rules has been established by a public review on [kde-core-devel|
+kde-community]@kde.org from at least two reviewers. The review has to be 
+repeated for every release if changes have been made to how/what data is 
+collected.
+
+Received data is regularly reviewed for violations of these rules, in 
+particular for data that is prone to fingerprinting. Should such violations be 
+found, the affected data will be deleted, and data recording will be suspended 
+until compliance with these rules has been established again. In order to 
+enable reviewing of the data, every KDE contributor with a developer account 
+will have access to all telemetry data gathered by any KDE product.
+
+--nextPart1627232.ab0ruIHapE
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part.
+Content-Transfer-Encoding: 7Bit
+
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQAnu3FVHA48KjZ07R/lszWTRLSRwUCWZAgMAAKCRB/lszWTRLS
+Ry5WAJ9+8r8e7IFPh54YBsEkisE3+dNs8QCfY+0b0jcYPVP1HdpsTZVoh33JfhU=
+=v6cZ
+-----END PGP SIGNATURE-----
+
+--nextPart1627232.ab0ruIHapE--
+
+
diff --git a/tests/threaddata/thread2 b/tests/threaddata/thread2
new file mode 100644
index 0000000..4d90073
--- /dev/null
+++ b/tests/threaddata/thread2
@@ -0,0 +1,129 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Wed, 16 Aug 2017 09:15:00 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx002.mykolab.com (unknown [10.9.13.2])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 1772014401C83
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:15:00 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.1])
+        by int-mx002.mykolab.com (Postfix) with ESMTPS id 01CCB2348
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:14:59 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in001.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in001.mykolab.com (Postfix) with ESMTPS id 3BC6B11AC
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:14:42 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 9F77F12C6
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 03:14:41 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 8EF798E597; Wed, 16 Aug 2017 03:14:41 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 03:14:41 -0400
+X-Cyrus-Session-Id: sloti36d2t28-476506-1502867681-2-17694110317903435823
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_20 -0.001, HEADER_FROM_DIFFERENT_DOMAINS 0.001,
+  RCVD_IN_DNSWL_MED -2.3, RP_MATCHES_RCVD -0.001, SPF_PASS -0.001,
+  LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='ch',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx4 ([10.202.2.203])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 03:14:41 -0400
+Authentication-Results: mx4.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=cVfBDwjP;
+    dmarc=none (p=none;has-list-id=yes) header.from=fuchsnet.ch;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx4.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx4.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 03:14:40 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502867678; bh=70oyTvxfLkdYUd1D8WFhrBEneI7DP4MY5KH1tM/AxUI=;
+        h=From:To:Subject:Date:In-Reply-To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=cVfBDwjPyB0OrVy5jQaU1YBZtx/95ktf4lpQDQddz0Udb+QkxzLzv6S3He6EjQIRs
+         nnEfVM/Y6V/Q9IHj+AYQckxyZxbXNOmfb9jOgU/R5bhPMkpstCvw/gQTD+LMGsFuSl
+         fCKdwg+KmAWmvBhoe+8Oa6BMR3KKViYziJgMTuwI=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: None (no SPF record) identity=mailfrom;
+ client-ip=2a00:d70:0:e::317; helo=mxout017.mail.hostpoint.ch;
+ envelope-from=christian.loosli@fuchsnet.ch; receiver=kde-community@kde.org 
+Received: from mxout017.mail.hostpoint.ch (mxout017.mail.hostpoint.ch
+ [IPv6:2a00:d70:0:e::317])
+ by postbox.kde.org (Postfix) with ESMTPS id AA196A3AC5
+ for <kde-community@kde.org>; Sun, 13 Aug 2017 10:18:17 +0000 (UTC)
+Received: from [10.0.2.45] (helo=asmtp012.mail.hostpoint.ch)
+ by mxout017.mail.hostpoint.ch with esmtp (Exim 4.89 (FreeBSD))
+ (envelope-from <christian.loosli@fuchsnet.ch>) id 1dgpyK-000DwH-Of
+ for kde-community@kde.org; Sun, 13 Aug 2017 12:18:16 +0200
+Received: from 77-56-19-119.dclient.hispeed.ch ([77.56.19.119]
+ helo=minixfox.localnet) by asmtp012.mail.hostpoint.ch with esmtpsa
+ (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89 (FreeBSD))
+ (envelope-from <christian.loosli@fuchsnet.ch>) id 1dgpyK-000CRa-ML
+ for kde-community@kde.org; Sun, 13 Aug 2017 12:18:16 +0200
+X-Authenticated-Sender-Id: mail@fuchsnet.ch
+From: Christian Loosli <christian.loosli@fuchsnet.ch>
+To: kde-community@kde.org
+Subject: Re: Telemetry Policy
+Date: Sun, 13 Aug 2017 12:18:16 +0200
+Message-ID: <2990543.KVDkBByYO0@minixfox>
+User-Agent: KMail/5.2.3 (Linux/4.6.2-040602-generic; KDE/5.35.0; x86_64; ; )
+In-Reply-To: <2048912.XfIJe3ZSdj@vkpc5>
+References: <2048912.XfIJe3ZSdj@vkpc5>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+X-Mailman-Approved-At: Wed, 16 Aug 2017 07:14:22 +0000
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+Hi, 
+
+thank you very much for this work, sounds great! 
+
+Only point I have: maybe make sure that the opt-in / default settings are not 
+only mandatory for application developers, but also for packagers / 
+distributions. 
+
+Some distributions have rather questionable views on privacy and by default 
+sent information to third parties, so I would feel much more safe if they 
+weren't allowed (in theory) to flick the switch in their package by default to 
+"on" either.
+
+Kind regards, 
+
+Christian 
diff --git a/tests/threaddata/thread3 b/tests/threaddata/thread3
new file mode 100644
index 0000000..84db2b3
--- /dev/null
+++ b/tests/threaddata/thread3
@@ -0,0 +1,184 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Wed, 16 Aug 2017 09:33:42 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx001.mykolab.com (unknown [10.9.13.1])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 5444D14414C34
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:33:42 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.2])
+        by int-mx001.mykolab.com (Postfix) with ESMTPS id 3DB4C114
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:33:42 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in002.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org header.b=PXk+9Qyc;
+        dkim=pass (2048-bit key) header.d=gmail.com header.b=j1CN7DJ2
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in002.mykolab.com (Postfix) with ESMTPS id DEAFCE9E
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:33:36 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 6AD87108D
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 03:33:35 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 444F38E597; Wed, 16 Aug 2017 03:33:35 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 03:33:35 -0400
+X-Cyrus-Session-Id: sloti36d2t28-546055-1502868815-2-14217351451016405562
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, FREEMAIL_FORGED_FROMDOMAIN 0.199, FREEMAIL_FROM 0.001,
+  HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='com',
+  MailFrom='org'
+X-Spam-charsets: plain='UTF-8'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx1 ([10.202.2.200])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 03:33:35 -0400
+Authentication-Results: mx1.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=PXk+9Qyc;
+    dkim=pass (2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=j1CN7DJ2;
+    dmarc=pass header.from=gmail.com;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=nOWNMzab
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx1.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx1.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 03:33:34 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502868810; bh=dVFv3mcZvqPFeac2frbs+zJpMjYutwuTUR/aZqUTbZY=;
+        h=In-Reply-To:References:From:Date:Subject:To:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=PXk+9Qyc+iRxwLPIHod4loutgNXu9pHl4peiPK0rI8Bl+4b02Cw0SUrzyf2JPqyDn
+         zuoxSnetdDbzoPnV1ep3yyHX+MhXiWvvc+PTKk15kIuBJYB77t+EJq3I/awvqG++Fa
+         d4Um24yPg/LUw5fFTsMuJ+Ra5MtpmFOmVbXrHDt0=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=2607:f8b0:4001:c0b::22f; helo=mail-it0-x22f.google.com;
+ envelope-from=valorie.zimmerman@gmail.com; receiver=kde-community@kde.org 
+Authentication-Results: postbox.kde.org; dkim=pass
+ reason="2048-bit key; unprotected key"
+ header.d=gmail.com header.i=@gmail.com header.b=j1CN7DJ2;
+ dkim-adsp=pass; dkim-atps=neutral
+Received: from mail-it0-x22f.google.com (mail-it0-x22f.google.com
+ [IPv6:2607:f8b0:4001:c0b::22f])
+ by postbox.kde.org (Postfix) with ESMTPS id 06F4BA0243
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 07:33:19 +0000 (UTC)
+Received: by mail-it0-x22f.google.com with SMTP id 76so14155500ith.0
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 00:33:19 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
+ h=mime-version:in-reply-to:references:from:date:message-id:subject:to;
+ bh=FXMFEApKo547tDMnIu6insMVxFcMsw7/E/4fcI3MkkQ=;
+ b=j1CN7DJ2CYaCWqNWOR7Hpjah/U+OYATQhmN+zVkgRNbVJOMVW6B4hWmUihH5Nll4/G
+ YX5O5OQv6i2y1hAqT3R3iISGAz70o2gIWjq14Ea+zqM9ztCM/ZX4XGaBqdv4dHTAMyDh
+ mg556PB77JLPlwHtf2CsR9gTSAC2BAuY8lsTdBV7jVkLjCGdjaSPRxiyf2t4WbcVmiUt
+ yZzWB7QmtQA4JHQ8N/bJ2lEg8cTWSj8p9o4kSAF7HDZ4X7pXfQgAPEAs/DHf9LMNGiys
+ 1xgAuYNxywGvtLaArQ+NXfgYH6VfRcFf7HFbMLs6yLyn63G9GLyUPHlHIgqWVAJrdn65
+ Nsow==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:mime-version:in-reply-to:references:from:date
+ :message-id:subject:to;
+ bh=FXMFEApKo547tDMnIu6insMVxFcMsw7/E/4fcI3MkkQ=;
+ b=nOWNMzabDGsTEZISXzVD7236lDYmFHF2kAEUxMmDSvGYEcq1/FjZwj7w7SJT62S/pY
+ oS29tWyY7LE4I+Fq5E6D8H2sfMAfaCoYQ1J27ftPVClg/kmiTGRzxf2tcv6TR/v56+vD
+ pwgDEDwgZs1oM6IBFrJr65u2+0mlcmK3qsRHBdjoQLEbZMa+GugjcI2HILqtmpTS+NJi
+ HZcVfEgOwkyqgoZkgBsaBui+5OUpz/yqryOsYx7kQxCy6uZJIFCB0dsvk7COE8nG7LYa
+ 0H8aRhVFxXRW76MUR6E67EhGMS+MS9F3DiXiUsWTn4yEZnC8cy76YPcPHVBBmGQ7CH0a
+ ScwA==
+X-Gm-Message-State: AHYfb5g0PFdyP1pw7TVZRMJqzU/nu12G3R2adj9OD2MzSxEew1QKnS99
+ U5MlthDVsG6C1f9Ak0fXNCtdI5w4CaBJhbc=
+X-Received: by 10.36.37.143 with SMTP id g137mr1056087itg.35.1502868798009;
+ Wed, 16 Aug 2017 00:33:18 -0700 (PDT)
+MIME-Version: 1.0
+Received: by 10.107.6.142 with HTTP; Wed, 16 Aug 2017 00:33:02 -0700 (PDT)
+In-Reply-To: <2990543.KVDkBByYO0@minixfox>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+From: Valorie Zimmerman <valorie.zimmerman@gmail.com>
+Date: Wed, 16 Aug 2017 00:33:02 -0700
+Message-ID: <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+Subject: Re: Telemetry Policy
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+Content-Type: text/plain; charset="UTF-8"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+Hi all, Mozilla has done a lot of work on telemetry, and we might be
+able to use some of their findings. On this page:
+https://wiki.mozilla.org/Firefox/Data_Collection they break down the
+data they might possibly collect into four buckets - technical (such
+as crashes), user interaction, web activity, and sensitive (personal
+data).
+
+This bit might be relevant to our discussion: "Categories 1 & 2
+(Technical & Interaction data)
+Pre-Release & Release: Data may default on, provided the data is
+exclusively in these categories (it cannot be in any other category).
+In Release, an opt-out must be available for most types of Technical
+and Interaction data. "
+
+I think the entire page might be enlightening to this discussion. I
+believe our analysis of needs should be more fine-grained, and that
+some parts of what we need can be "default on" especially for
+pre-release testing. For releases, we can provide an opt-out.
+
+Other more sensitive data will need to be opt-in. I think it's a
+mistake to treat all the data we might want all in the same way.
+
+Valorie
+
+
+On Sun, Aug 13, 2017 at 3:18 AM, Christian Loosli
+<christian.loosli@fuchsnet.ch> wrote:
+> Hi,
+>
+> thank you very much for this work, sounds great!
+>
+> Only point I have: maybe make sure that the opt-in / default settings are not
+> only mandatory for application developers, but also for packagers /
+> distributions.
+>
+> Some distributions have rather questionable views on privacy and by default
+> sent information to third parties, so I would feel much more safe if they
+> weren't allowed (in theory) to flick the switch in their package by default to
+> "on" either.
+>
+> Kind regards,
+>
+> Christian
+
+
+
+-- 
+http://about.me/valoriez
diff --git a/tests/threaddata/thread4 b/tests/threaddata/thread4
new file mode 100644
index 0000000..492d64d
--- /dev/null
+++ b/tests/threaddata/thread4
@@ -0,0 +1,187 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Wed, 16 Aug 2017 14:15:52 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx001.mykolab.com (unknown [10.9.13.1])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id B5DFE145C97EA
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 14:15:52 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.3])
+        by int-mx001.mykolab.com (Postfix) with ESMTPS id 9430B114
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 14:15:52 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in003.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in003.mykolab.com (Postfix) with ESMTPS id 87ADC292C
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 14:15:41 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 14E06F2B
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 08:15:41 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 02B668E597; Wed, 16 Aug 2017 08:15:40 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 08:15:40 -0400
+X-Cyrus-Session-Id: sloti36d2t28-920397-1502885740-5-10891205693403350257
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_MED -2.3, RP_MATCHES_RCVD -0.001,
+  SPF_PASS -0.001, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='utf-8'
+X-Attached: signature.asc
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx1 ([10.202.2.200])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 08:15:40 -0400
+Authentication-Results: mx1.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=dcc9ZeF1;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    smime=temperror;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx1.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx1.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 08:15:40 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502885735; bh=SH/qVWnJJ/KE8PqQNaOwBRNoy7rIm5VobJE4/TZFZ9g=;
+        h=From:To:Subject:Date:In-Reply-To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=dcc9ZeF1EO5Q0C8mVOjhOITKyPmrCB9KGB4gKdTSfuxo4OZGKHg/xi7VH0/UDLYxy
+         Ni1GHXrJiD50yXOLDYICYr0XsDpYQaHmRQXGs6O6g/hIYxR2BCdqH1/5/NgNzPyjLH
+         5aKmEZt4LH8/JKYnv1UJCiKdhG2UQrs3fSg/ZMpM=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Neutral (access neither permitted nor denied) identity=mailfrom;
+ client-ip=85.214.75.115; helo=h2670809.stratoserver.net;
+ envelope-from=vkrause@kde.org; receiver=kde-community@kde.org 
+Received: from h2670809.stratoserver.net (deltatauchi.de [85.214.75.115])
+ by postbox.kde.org (Postfix) with ESMTP id 7F686A0160
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 12:15:15 +0000 (UTC)
+Received: from vkpc19.localnet (unknown [185.28.184.2])
+ by h2670809.stratoserver.net (Postfix) with ESMTPSA id 59DBAF1A0104
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 14:14:44 +0200 (CEST)
+From: Volker Krause <vkrause@kde.org>
+To: kde-community@kde.org
+Subject: Re: Telemetry Policy
+Date: Wed, 16 Aug 2017 14:13:48 +0200
+Message-ID: <1942419.JquqIjZoWq@vkpc19>
+Organization: KDE
+In-Reply-To: <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+MIME-Version: 1.0
+Content-Type: multipart/signed; boundary="nextPart3633370.DIlRsSa6NW";
+ micalg="pgp-sha1"; protocol="application/pgp-signature"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+--nextPart3633370.DIlRsSa6NW
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="utf-8"
+
+On Wednesday, 16 August 2017 09:33:02 CEST Valorie Zimmerman wrote:
+> Hi all, Mozilla has done a lot of work on telemetry, and we might be
+> able to use some of their findings. On this page:
+> https://wiki.mozilla.org/Firefox/Data_Collection they break down the
+> data they might possibly collect into four buckets - technical (such
+> as crashes), user interaction, web activity, and sensitive (personal
+> data).
+
+without making it that explicit, we basically have the same four categories of 
+data too, and explicitly exclude the use of category 3 and 4, ie user content/
+activity and personal data, only technical and interaction data are allowed to 
+be used (category 1 and 2).
+ 
+> This bit might be relevant to our discussion: "Categories 1 & 2
+> (Technical & Interaction data)
+> Pre-Release & Release: Data may default on, provided the data is
+> exclusively in these categories (it cannot be in any other category).
+> In Release, an opt-out must be available for most types of Technical
+> and Interaction data. "
+> 
+> I think the entire page might be enlightening to this discussion. I
+> believe our analysis of needs should be more fine-grained, and that
+> some parts of what we need can be "default on" especially for
+> pre-release testing. For releases, we can provide an opt-out.
+> 
+> Other more sensitive data will need to be opt-in. I think it's a
+> mistake to treat all the data we might want all in the same way.
+
+This again brings up opt-out, which so far doesn't seem to have a chance for 
+consensus. Can we defer this to when we have some more experience with the 
+opt-in approach and how much participation we get with that? Or are people 
+feeling this would too strongly limit what they are allowed to do in their 
+applications? 
+
+Seeing yesterday's blog from the Krita team (https://akapust1n.github.io/
+2017-08-15-sixth-blog-gsoc-2017/), I'd particularly be interested in their 
+view on this.
+
+Regards,
+Volker
+
+> On Sun, Aug 13, 2017 at 3:18 AM, Christian Loosli
+> 
+> <christian.loosli@fuchsnet.ch> wrote:
+> > Hi,
+> > 
+> > thank you very much for this work, sounds great!
+> > 
+> > Only point I have: maybe make sure that the opt-in / default settings are
+> > not only mandatory for application developers, but also for packagers /
+> > distributions.
+> > 
+> > Some distributions have rather questionable views on privacy and by
+> > default
+> > sent information to third parties, so I would feel much more safe if they
+> > weren't allowed (in theory) to flick the switch in their package by
+> > default to "on" either.
+> > 
+> > Kind regards,
+> > 
+> > Christian
+
+
+
+--nextPart3633370.DIlRsSa6NW
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part.
+Content-Transfer-Encoding: 7Bit
+
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQAnu3FVHA48KjZ07R/lszWTRLSRwUCWZQ2/AAKCRB/lszWTRLS
+R+niAKCpVjpRVPq455bnZlAVxpARkGWE/gCcCaBN1QAFz8Da6XIKJGY7iukaS3A=
+=ZSiq
+-----END PGP SIGNATURE-----
+
+--nextPart3633370.DIlRsSa6NW--
diff --git a/tests/threaddata/thread5 b/tests/threaddata/thread5
new file mode 100644
index 0000000..def438c
--- /dev/null
+++ b/tests/threaddata/thread5
@@ -0,0 +1,119 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Wed, 16 Aug 2017 15:30:55 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx001.mykolab.com (unknown [10.9.13.1])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 2C73C14646FD6
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 15:30:55 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.2])
+        by int-mx001.mykolab.com (Postfix) with ESMTPS id 0324D114
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 15:30:54 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in002.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in002.mykolab.com (Postfix) with ESMTPS id C91AA866
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 15:30:34 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 5C87A1858
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 09:30:33 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 4CC8B8E597; Wed, 16 Aug 2017 09:30:33 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 09:30:33 -0400
+X-Cyrus-Session-Id: sloti36d2t28-1026013-1502890233-2-11003035487755983862
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: 
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx5 ([10.202.2.204])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 09:30:33 -0400
+Authentication-Results: mx5.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=RolpJ4HJ;
+    dmarc=none (p=none;has-list-id=yes) header.from=valdyas.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx5.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx5.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 09:30:32 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502890227; bh=z989fztQpyrmqEjIXZUifZvjlTrbUJ38xgYnpo5TWHY=;
+        h=Date:From:To:Subject:In-Reply-To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=RolpJ4HJf2ZKKk0rJkqOuvP1Ed5rERJZdvt2+FMMsImGArH3hWTlgl1qQewN3B81n
+         Nq4o83kvWrlw2Y0i0n/fd+NjBLY9wtDBeRslr06KZSnZe4vL6N8p15wkQIs+oUAvCL
+         01Uy2pFX/99m+u66rd5IH2Epkdj9iSn2S6U0S3Ew=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: None (no SPF record) identity=mailfrom; client-ip=80.100.45.33;
+ helo=calcifer.valdyas.org; envelope-from=boud@valdyas.org;
+ receiver=kde-community@kde.org 
+Received: from calcifer.valdyas.org (calcifer.xs4all.nl [80.100.45.33])
+ by postbox.kde.org (Postfix) with ESMTP id 6A134A0178
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 13:30:15 +0000 (UTC)
+Received: by calcifer.valdyas.org (Postfix, from userid 1001)
+ id D3C2BC283D; Wed, 16 Aug 2017 15:30:14 +0200 (CEST)
+Date: Wed, 16 Aug 2017 15:30:14 +0200 (CEST)
+From: Boudewijn Rempt <boud@valdyas.org>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+Subject: Re: Telemetry Policy
+In-Reply-To: <1942419.JquqIjZoWq@vkpc19>
+Message-ID: <alpine.LNX.2.00.1708161528260.1363@calcifer.valdyas.org>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+ <1942419.JquqIjZoWq@vkpc19>
+User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+On Wed, 16 Aug 2017, Volker Krause wrote:
+
+> Seeing yesterday's blog from the Krita team (https://akapust1n.github.io/
+> 2017-08-15-sixth-blog-gsoc-2017/), I'd particularly be interested in their 
+> view on this.
+
+I've pointed alexey at this thread, but there's a huge language barrier:
+he basically communicates through google translate. I've made it a firm
+condition of merging and operating the telemetry that we adhere to the
+KDE policy in every way. Even then, I still consider his work to be
+an experimental research project.
+
+-- 
+Boudewijn Rempt | http://www.krita.org, http://www.valdyas.org
diff --git a/tests/threaddata/thread6 b/tests/threaddata/thread6
new file mode 100644
index 0000000..5ff64ff
--- /dev/null
+++ b/tests/threaddata/thread6
@@ -0,0 +1,175 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 01:47:27 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx002.mykolab.com (unknown [10.9.13.2])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 2CC5214A68D1A
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:27 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.2])
+        by int-mx002.mykolab.com (Postfix) with ESMTPS id 13C82F44
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:27 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in002.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in002.mykolab.com (Postfix) with ESMTPS id DA7D7211
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:15 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id F078A4C
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 19:47:14 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id D2D7E8E231; Wed, 16 Aug 2017 19:47:14 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 19:47:14 -0400
+X-Cyrus-Session-Id: sloti36d2t28-1787481-1502927234-2-5475491779407099440
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: yes ("Address thomas.pfeiffer@kde.org in From header is in addressbook");
+ in-addressbook
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_MED -2.3, RCVD_IN_SORBS_SPAM 0.5,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx6 ([10.202.2.205])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 19:47:14 -0400
+Authentication-Results: mx6.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=jjcN/rDm;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=MDpKFUTu
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx6.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx6.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 19:47:13 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502927232; bh=ZPaDxaRw15uQ6A7HkCF2KoV4m+FrAkqde8P/U1SNqY8=;
+        h=From:To:Subject:Date:In-Reply-To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=jjcN/rDm5jM+2ttx4iyMXexUXHMS9OAzt1cfA461VOjTfg9ZPg+Kt1qCqUVzJNoSj
+         tXrKk69VVjb7tr4GNWJMKc2FAb5P33ndx6UC08kFDADMECoxSgwbHeKWdKCLE0KqOH
+         sCtYBZp0heUQzEztcQtjwtPuExHqivuLyYqZRvyM=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=209.85.128.174; helo=mail-wr0-f174.google.com;
+ envelope-from=t.pfeiffer.ux@gmail.com; receiver=kde-community@kde.org 
+Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com
+ [209.85.128.174])
+ by postbox.kde.org (Postfix) with ESMTPS id 6AB96A029E
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 23:46:52 +0000 (UTC)
+Received: by mail-wr0-f174.google.com with SMTP id b65so29404863wrd.0
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 16:46:52 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:subject:date:message-id:organization
+ :in-reply-to:references:mime-version:content-transfer-encoding;
+ bh=vOHtuq150Bi0dtLwrlvhmLXneJGQN+nwYPMD7ClfMTY=;
+ b=MDpKFUTuVW39/V5tI6WXpiuZNRgPorWVPEILVo6uTCaSPIWU4FPwx/FYFqYRnwLLZ4
+ JwLB2+R6USx5jpbjlgx7GDEuCAAGm+GI7GtyLRb0tZZMtXW7glpa2IuqLPTtIygXQSn4
+ nsSRysSlT02zZ26qbDXYeoWUOpn2CK2fmQ9l9q29GdTmC/+Ud4vfJqdW/nvnczqZVyyF
+ zUsQuOalp0VORBdSgDxDrtEA50pR+8TrnBu48u4OSigb4d6QgqZvPEYSPp7UWHmuEoBe
+ F92VN6efXYqb4tRUthsfokDw7l1TFhRB0g0UOl7BxXrRT54MGceiJ4fY8jVD+7+DN3aT
+ pD3g==
+X-Gm-Message-State: AHYfb5gfW1I+uGmtawofLSI0ZX4ZfkMah5Eyn73zmN/CEJ0d9ZDOFpsR
+ Y4FpRIYROX0uhR9L
+X-Received: by 10.28.11.131 with SMTP id 125mr45861wml.82.1502927211295;
+ Wed, 16 Aug 2017 16:46:51 -0700 (PDT)
+Received: from lenovo.localnet ([2a02:8071:31c0:f00:626c:66ff:fe3f:93eb])
+ by smtp.gmail.com with ESMTPSA id r70sm3132823wmb.35.2017.08.16.16.46.48
+ for <kde-community@kde.org>
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+ Wed, 16 Aug 2017 16:46:49 -0700 (PDT)
+From: Thomas Pfeiffer <thomas.pfeiffer@kde.org>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+Subject: Re: Telemetry Policy
+Date: Thu, 17 Aug 2017 01:46:48 +0200
+Message-ID: <5231282.Ch11jfsTMl@lenovo>
+Organization: KDE
+In-Reply-To: <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+On Mittwoch, 16. August 2017 09:33:02 CEST Valorie Zimmerman wrote:
+> Hi all, Mozilla has done a lot of work on telemetry, and we might be
+> able to use some of their findings. On this page:
+> https://wiki.mozilla.org/Firefox/Data_Collection they break down the
+> data they might possibly collect into four buckets - technical (such
+> as crashes), user interaction, web activity, and sensitive (personal
+> data).
+> 
+> This bit might be relevant to our discussion: "Categories 1 & 2
+> (Technical & Interaction data)
+> Pre-Release & Release: Data may default on, provided the data is
+> exclusively in these categories (it cannot be in any other category).
+> In Release, an opt-out must be available for most types of Technical
+> and Interaction data. "
+> 
+> I think the entire page might be enlightening to this discussion. I
+> believe our analysis of needs should be more fine-grained, and that
+> some parts of what we need can be "default on" especially for
+> pre-release testing. For releases, we can provide an opt-out.
+
+Hi Valorie,
+Even if opt-out for some data is legally and even morally fine, it does not 
+align with the values we communicate to our users:
+Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and we're 
+striving to make privacy our USP.
+
+Therefore I agree with others who replied in this thread: We should respect 
+privacy unnecessarily much rather than too little.
+
+In the end, of course, it's a matter of how we present this opt-in. If it's an 
+option buried in some settings dialog, we might as well not do it at all.
+
+If we, however - like Firefox does -, pfominently present that choice to users 
+the first time they run one of our applications or desktop environment and try 
+to make clear why that data collection is important for us, I don't see why we 
+could not convince a relevant number of users to opt in.
+Sure, we'll get less data than with an opt-out scheme, but let's try it out 
+first before we go for the option that carries a significant PR risk.
+
+> Other more sensitive data will need to be opt-in. I think it's a
+> mistake to treat all the data we might want all in the same way.
+
+Content (web activity for Mozilla) and personal information should not be opt-
+anything but not collected at all.
+
+Cheers,
+Thomas
diff --git a/tests/threaddata/thread7 b/tests/threaddata/thread7
new file mode 100644
index 0000000..b751d60
--- /dev/null
+++ b/tests/threaddata/thread7
@@ -0,0 +1,297 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 17:40:53 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx003.mykolab.com (unknown [10.9.13.3])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 467271505D03E
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:40:53 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.3])
+        by int-mx003.mykolab.com (Postfix) with ESMTPS id 2CC4FF16
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:40:53 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in003.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org header.b=rysq5aPx;
+        dkim=fail (2048-bit key) reason="fail (message has been altered)"
+        header.d=gmail.com header.b=WiuysEuO
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in003.mykolab.com (Postfix) with ESMTPS id 9C4BA2EB8
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:39:23 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 5138E1453
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 11:39:22 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 48C918E9B6; Thu, 17 Aug 2017 11:39:22 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Thu, 17 Aug 2017 11:39:22 -0400
+X-Cyrus-Session-Id: sloti36d2t28-3156705-1502984362-2-3811956415179411272
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, HTML_MESSAGE 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii', html='us-ascii'
+X-Attached: signature.asc
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx3 ([10.202.2.202])
+  by compute1.internal (LMTPProxy); Thu, 17 Aug 2017 11:39:22 -0400
+Authentication-Results: mx3.messagingengine.com;
+    dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=WiuysEuO;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=rysq5aPx;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=fail (message has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=eS2FiZD3
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx3.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx3.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Thu, 17 Aug 2017 11:39:21 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502984359; bh=g7hsgd71OQgeOpLvXEjz16cF2X/6f5pmr2ujAF633tY=;
+        h=From:Date:Subject:In-Reply-To:To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=rysq5aPxwhI8i+Fx0jQHMx7aHC9RRMfjzmZTplBHjuND6qLLgZgMg2Tqpwgp1PnTR
+         zbpE07c5O50AqjjN74AqtaWdN7xCtsPb1taF9XjBDScI3wVcmiRZ5d88Sp9YI8rAzy
+         cY5uS6QDZfPt/BmonQqnc0oKpuuIlSp78R482qck=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=2a00:1450:400c:c0c::22a; helo=mail-wr0-x22a.google.com;
+ envelope-from=mirko.mb.boehm@gmail.com; receiver=kde-community@kde.org 
+Authentication-Results: postbox.kde.org; dkim=pass
+ reason="2048-bit key; unprotected key"
+ header.d=gmail.com header.i=@gmail.com header.b=WiuysEuO;
+ dkim-adsp=pass; dkim-atps=neutral
+Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com
+ [IPv6:2a00:1450:400c:c0c::22a])
+ by postbox.kde.org (Postfix) with ESMTPS id 6622AA028C;
+ Thu, 17 Aug 2017 15:38:56 +0000 (UTC)
+Received: by mail-wr0-x22a.google.com with SMTP id b65so47289023wrd.0;
+ Thu, 17 Aug 2017 08:38:56 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
+ h=sender:from:message-id:mime-version:date:subject:in-reply-to:to
+ :references; bh=yh4e0FfFAXMmAqoicYQa52CLKXFU6SJTKLd0PdPDxRM=;
+ b=WiuysEuO59GFkLy+fKRSFayTM8LXWK3dVaVHDKfsw/XM8YKcLalwNWGVU0tsaDl+7P
+ r5MMLidc6O0gJKGftMdhWrjeFGY0aE5F5+2NKN1oEb2INbB/DrS9KaCVy1SWvHVu8zOo
+ t13omoGW6RIs5lgWrTLR1iwcwtfkWwO/+Ndy16U3/eYJSXeUPWHsVSXP0UgIS6IANt58
+ lNQhTgWBAJNViCxH/p5nIZYvLY5tGJPL6J46GaM7jUK4Ev6HUx4pUwGBsPB4hBezPm7h
+ mzA74izFW7jE6JklTciMAb0q7wEG15exVQbTEG54nvWMASrWx6mMAc+CWLh/T8vokpvT
+ Kvrw==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:sender:from:message-id:mime-version:date:subject
+ :in-reply-to:to:references;
+ bh=yh4e0FfFAXMmAqoicYQa52CLKXFU6SJTKLd0PdPDxRM=;
+ b=eS2FiZD3QQ7P0mT2qKkYWf91vVTGXnIHKKzNdIJq+8JXN8WoXQ8IXmvQqSQFJa/w16
+ m9I0Yko7iv/JDAa7YTeJraBfImv9weknM3zpUNan8SltCFNXO8f4yylP1rGLn0RWbQ3Q
+ 9NEpmYbS5dYQ79PMwy3zHxZEkUbsIFk8OlVSohdzpzGgtyU6nOjnBDULL14uHnouaz8+
+ TDss7L/vKlmrWOYdH+R8peCkFI6p3C69wpAEyNPGBaGyCRC+pebx6GGDBR63DFnyP464
+ VFQCUS4hPPTFaBPriqOF6xcWToacU40DVy3s2S/3EwHpUGWi+WMqQpPgqZYJh81unCDH
+ Hc7g==
+X-Gm-Message-State: AHYfb5hHmIopTFINsSS7+92/GpIh2jJhvpwp/cI1ajaDE2GLp/oZ6V7N
+ CCtnx8PQ3oXGOEKCRT4=
+X-Received: by 10.80.212.133 with SMTP id s5mr2195642edi.95.1502984335423;
+ Thu, 17 Aug 2017 08:38:55 -0700 (PDT)
+Received: from ?IPv6:2a02:8109:a4bf:e114:30bf:9873:2660:a4a8?
+ ([2a02:8109:a4bf:e114:30bf:9873:2660:a4a8])
+ by smtp.gmail.com with ESMTPSA id r29sm1790792edi.85.2017.08.17.08.38.52
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+ Thu, 17 Aug 2017 08:38:52 -0700 (PDT)
+From: Mirko Boehm - KDE <mirko@kde.org>
+Message-Id: <B95D7D2A-23A9-4245-AAC0-8A3FAE330090@kde.org>
+Content-Type: multipart/signed;
+ boundary="Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
+Date: Thu, 17 Aug 2017 17:38:52 +0200
+Subject: Re: Telemetry Policy
+In-Reply-To: <5231282.Ch11jfsTMl@lenovo>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+ <5231282.Ch11jfsTMl@lenovo>
+X-Mailer: Apple Mail (2.3273)
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD
+Content-Type: multipart/alternative;
+        boundary="Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040"
+
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+        charset=us-ascii
+
+Hi,
+
+> On 17. Aug 2017, at 01:46, Thomas Pfeiffer <thomas.pfeiffer@kde.org> =
+wrote:
+>=20
+> Hi Valorie,
+> Even if opt-out for some data is legally and even morally fine, it =
+does not
+> align with the values we communicate to our users:
+> Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and =
+we're
+> striving to make privacy our USP.
+
+We seem to assume a contradiction between telemetry and privacy. I =
+believe this is a knee-jerk reaction. We can implement telemetry in a =
+way that privacy is not violated. In fact, I would say that it follows =
+from our vision that we should do this.
+
+Cheers,
+
+Mirko.
+--
+Mirko Boehm | mirko@kde.org | KDE e.V.
+FSFE Fellowship Representative, FSFE Team Germany
+Qt Certified Specialist and Trainer
+Request a meeting: https://doodle.com/mirkoboehm
+
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/html;
+        charset=us-ascii
+
+<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
+charset=3Dus-ascii"></head><body style=3D"word-wrap: break-word; =
+-webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
+class=3D"">Hi,&nbsp;<div class=3D""><br class=3D""><div><blockquote =
+type=3D"cite" class=3D""><div class=3D"">On 17. Aug 2017, at 01:46, =
+Thomas Pfeiffer &lt;<a href=3D"mailto:thomas.pfeiffer@kde.org" =
+class=3D"">thomas.pfeiffer@kde.org</a>&gt; wrote:</div><br =
+class=3D"Apple-interchange-newline"><div class=3D""><span =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; =
+float: none; display: inline !important;" class=3D"">Hi =
+Valorie,</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Even if opt-out for some data is legally =
+and even morally fine, it does not<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">align with the values we communicate to our =
+users:</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Unlike Mozilla's Mission, our Vision =
+mentions privacy explicitly, and we're<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">striving to make privacy our USP.</span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""></div></blockquote><br class=3D""></div><div>We seem to =
+assume a contradiction between telemetry and privacy. I believe this is =
+a knee-jerk reaction. We can implement telemetry in a way that privacy =
+is not violated. In fact, I would say that it follows from our vision =
+that we should do this.</div><div><br =
+class=3D""></div><div>Cheers,</div><div><br =
+class=3D""></div><div>Mirko.</div><div class=3D"">
+<div style=3D"orphans: auto; text-align: start; text-indent: 0px; =
+widows: auto; word-wrap: break-word; -webkit-nbsp-mode: space; =
+-webkit-line-break: after-white-space;" class=3D""><div style=3D"color: =
+rgb(0, 0, 0); letter-spacing: normal; text-transform: none; white-space: =
+normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; orphans: =
+auto; text-align: start; text-indent: 0px; widows: auto; word-wrap: =
+break-word; -webkit-nbsp-mode: space; -webkit-line-break: =
+after-white-space;" class=3D"">--&nbsp;<br class=3D""></div><div =
+style=3D"orphans: auto; text-align: start; text-indent: 0px; widows: =
+auto; word-wrap: break-word; -webkit-nbsp-mode: space; =
+-webkit-line-break: after-white-space;" class=3D"">Mirko Boehm | <a =
+href=3D"mailto:mirko@kde.org" class=3D"">mirko@kde.org</a> | KDE e.V.<br =
+class=3D"">FSFE Fellowship Representative, FSFE Team Germany<br =
+class=3D"">Qt Certified Specialist and Trainer<br class=3D"">Request a =
+meeting: <a href=3D"https://doodle.com/mirkoboehm" =
+class=3D"">https://doodle.com/mirkoboehm</a><br class=3D""></div></div>
+</div>
+
+<br class=3D""></div></body></html>=
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040--
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+        filename=signature.asc
+Content-Type: application/pgp-signature;
+        name=signature.asc
+Content-Description: Message signed with OpenPGP
+
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iEYEARECAAYFAlmVuIwACgkQYSSaITCTnKX82QCgxjyaXNsffHG/42ioAQrxjdCN
+D4kAn2Vv0q16buzjcRel1P144tLyqbr+
+=muZP
+-----END PGP SIGNATURE-----
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD--
diff --git a/tests/threaddata/thread8 b/tests/threaddata/thread8
new file mode 100644
index 0000000..b57daee
--- /dev/null
+++ b/tests/threaddata/thread8
@@ -0,0 +1,253 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 18:40:51 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx001.mykolab.com (unknown [10.9.13.1])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id A9D23150D1CA9
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:40:51 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.1])
+        by int-mx001.mykolab.com (Postfix) with ESMTPS id 8FACC185
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:40:51 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in001.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in001.mykolab.com (Postfix) with ESMTPS id 1B005169D
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:20:40 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id B9C0FFD6
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 12:20:39 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id A9EF58E9B6; Thu, 17 Aug 2017 12:20:39 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Thu, 17 Aug 2017 12:20:39 -0400
+X-Cyrus-Session-Id: sloti36d2t28-3239059-1502986839-5-11465270081887081630
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: yes ("Address thomas.pfeiffer@kde.org in From header is in addressbook");
+ in-addressbook
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, HTML_MESSAGE 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RCVD_IN_SORBS_SPAM 0.5, RP_MATCHES_RCVD -0.001, SPF_PASS -0.001,
+  LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='utf-8', html='utf-8'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx3 ([10.202.2.202])
+  by compute1.internal (LMTPProxy); Thu, 17 Aug 2017 12:20:39 -0400
+Authentication-Results: mx3.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=iaOusBVL;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=J3ZGQfFP
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx3.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx3.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Thu, 17 Aug 2017 12:20:38 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502986836; bh=NN9eLPZMdRJe0stu0TDb+ROhjuNPhd/mDnhblsQ4F04=;
+        h=From:Subject:Date:References:To:In-Reply-To:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=iaOusBVLSdEJElb2uoxf5ubKrt5iXH5zKZqAsGo/Ltor16eJ57YIP6QGSNn+L7fCO
+         QHgR+fL1/OCWmfEs80xz7ycwjVTdHSt8a9nP7EwwLfQFJ3b1bCs8hNFyLpwrlzH87p
+         6I1z36M4x53j3Yq7OU5DIWw7TieU2TaHCCClC1Cg=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=209.85.128.181; helo=mail-wr0-f181.google.com;
+ envelope-from=t.pfeiffer.ux@gmail.com; receiver=kde-community@kde.org 
+Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com
+ [209.85.128.181])
+ by postbox.kde.org (Postfix) with ESMTPS id A2098A0194
+ for <kde-community@kde.org>; Thu, 17 Aug 2017 16:20:19 +0000 (UTC)
+Received: by mail-wr0-f181.google.com with SMTP id f8so3729162wrf.3
+ for <kde-community@kde.org>; Thu, 17 Aug 2017 09:20:19 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:mime-version:subject:date:references:to
+ :in-reply-to:message-id;
+ bh=wicjkfxhAhrD+Lja6y+RkFl7BL7WSAOVLHUYZTaQM+E=;
+ b=J3ZGQfFPOcZSNOlqbFSZ/oBBPQSnoMN2pIBb5YlfFBYeCY2Rt6Xx0X0S/wET6IAcE6
+ ZILrUjwPh9q3Bjhx0x+CAGscD/sNJBosuBoVrE1ZFX2d8prqRz9D8fNeeCtuPnRgkDmm
+ EBW3JP5ifajIMbUnHPevV1W8er5VY1uqWW/z6lZu7iH1zabPs+5wS+X0M1xx71xBxTb1
+ Dx4jpLO/SRNSEIKZ0q1l0p6f9/9P9VScWbyDw7NeI1yj0GfRhNSP64dlQU3Z07vqaoKP
+ vfhpG0gFX/FEr0+MPz2r10v6LP1iACBlhOHwHZxYLTz/mNwvHvsLB6JWFoZ0FuwLRQFN
+ X47g==
+X-Gm-Message-State: AHYfb5hGX37YHJwSkL5Gin7U/eRe+E5RLYqxnYErKBibvkrRhrJDArNX
+ VyIneA7/u3wUDC0Wvl8=
+X-Received: by 10.223.176.5 with SMTP id f5mr3522751wra.194.1502986818721;
+ Thu, 17 Aug 2017 09:20:18 -0700 (PDT)
+Received: from [172.16.5.187] ([109.109.206.114])
+ by smtp.gmail.com with ESMTPSA id 5sm4544042wre.5.2017.08.17.09.20.17
+ for <kde-community@kde.org>
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+ Thu, 17 Aug 2017 09:20:17 -0700 (PDT)
+From: Thomas Pfeiffer <thomas.pfeiffer@kde.org>
+Content-Type: multipart/alternative;
+ boundary="Apple-Mail=_AF2C4455-1CF7-489B-98CD-6BFD8687BF81"
+Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
+Subject: Re: Telemetry Policy
+Date: Thu, 17 Aug 2017 18:20:16 +0200
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+ <5231282.Ch11jfsTMl@lenovo> <B95D7D2A-23A9-4245-AAC0-8A3FAE330090@kde.org>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+In-Reply-To: <B95D7D2A-23A9-4245-AAC0-8A3FAE330090@kde.org>
+Message-Id: <5A696707-744C-4035-A8FA-CA83EE8691D6@kde.org>
+X-Mailer: Apple Mail (2.3273)
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+
+--Apple-Mail=_AF2C4455-1CF7-489B-98CD-6BFD8687BF81
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+        charset=utf-8
+
+
+> On 17. Aug 2017, at 17:38, Mirko Boehm - KDE <mirko@kde.org> wrote:
+>=20
+> Hi,=20
+>=20
+>> On 17. Aug 2017, at 01:46, Thomas Pfeiffer <thomas.pfeiffer@kde.org =
+<mailto:thomas.pfeiffer@kde.org>> wrote:
+>>=20
+>> Hi Valorie,
+>> Even if opt-out for some data is legally and even morally fine, it =
+does not=20
+>> align with the values we communicate to our users:
+>> Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and =
+we're=20
+>> striving to make privacy our USP.
+>=20
+> We seem to assume a contradiction between telemetry and privacy. I =
+believe this is a knee-jerk reaction. We can implement telemetry in a =
+way that privacy is not violated. In fact, I would say that it follows =
+from our vision that we should do this.
+>=20
+
+The problem is: I expect users to have the same knee-jerk reaction. I =
+don=E2=80=99t see us being able to explain to users that actually their =
+privacy is perfectly safe before they freak out.
+Privacy-minded Free Software users have freaked out in the past over =
+things which objectively speaking were not a huge deal.
+It=E2=80=99s emotion more than rational arguments
+
+
+--Apple-Mail=_AF2C4455-1CF7-489B-98CD-6BFD8687BF81
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/html;
+        charset=utf-8
+
+<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
+charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; =
+-webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
+class=3D""><br class=3D""><div><blockquote type=3D"cite" class=3D""><div =
+class=3D"">On 17. Aug 2017, at 17:38, Mirko Boehm - KDE &lt;<a =
+href=3D"mailto:mirko@kde.org" class=3D"">mirko@kde.org</a>&gt; =
+wrote:</div><br class=3D"Apple-interchange-newline"><div class=3D""><meta =
+http-equiv=3D"Content-Type" content=3D"text/html charset=3Dus-ascii" =
+class=3D""><div style=3D"word-wrap: break-word; -webkit-nbsp-mode: =
+space; -webkit-line-break: after-white-space;" class=3D"">Hi,&nbsp;<div =
+class=3D""><br class=3D""><div class=3D""><blockquote type=3D"cite" =
+class=3D""><div class=3D"">On 17. Aug 2017, at 01:46, Thomas Pfeiffer =
+&lt;<a href=3D"mailto:thomas.pfeiffer@kde.org" =
+class=3D"">thomas.pfeiffer@kde.org</a>&gt; wrote:</div><br =
+class=3D"Apple-interchange-newline"><div class=3D""><span =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; =
+float: none; display: inline !important;" class=3D"">Hi =
+Valorie,</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Even if opt-out for some data is legally =
+and even morally fine, it does not<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">align with the values we communicate to our =
+users:</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Unlike Mozilla's Mission, our Vision =
+mentions privacy explicitly, and we're<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">striving to make privacy our USP.</span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""></div></blockquote><br class=3D""></div><div class=3D"">We =
+seem to assume a contradiction between telemetry and privacy. I believe =
+this is a knee-jerk reaction. We can implement telemetry in a way that =
+privacy is not violated. In fact, I would say that it follows from our =
+vision that we should do this.</div><div class=3D""><br =
+class=3D""></div></div></div></div></blockquote><div><br =
+class=3D""></div>The problem is: I expect users to have the same =
+knee-jerk reaction. I don=E2=80=99t see us being able to explain to =
+users that actually their privacy is perfectly safe before they freak =
+out.</div><div>Privacy-minded Free Software users have freaked out in =
+the past over things which objectively speaking were not a huge =
+deal.</div><div>It=E2=80=99s emotion more than rational =
+arguments</div><br class=3D""></body></html>=
+
+--Apple-Mail=_AF2C4455-1CF7-489B-98CD-6BFD8687BF81--
diff --git a/tests/threaddata/thread9 b/tests/threaddata/thread9
new file mode 100644
index 0000000..c17e7fd
--- /dev/null
+++ b/tests/threaddata/thread9
@@ -0,0 +1,283 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 18:30:41 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx001.mykolab.com (unknown [10.9.13.1])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 92811150C3DE0
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:30:41 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.3])
+        by int-mx001.mykolab.com (Postfix) with ESMTPS id 7973B11D
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:30:41 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in003.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org header.b=q4j4OOKP;
+        dkim=fail (2048-bit key) reason="fail (message has been altered)"
+        header.d=gmail.com header.b=DJRXq7Se
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in003.mykolab.com (Postfix) with ESMTPS id 3E01E292D
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 18:30:29 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 89BC31A23
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 12:30:28 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 6EC348E9B6; Thu, 17 Aug 2017 12:30:28 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Thu, 17 Aug 2017 12:30:28 -0400
+X-Cyrus-Session-Id: sloti36d2t28-3239059-1502987428-2-12164706007640762698
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, HTML_MESSAGE 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='UTF-8', html='UTF-8'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx1 ([10.202.2.200])
+  by compute1.internal (LMTPProxy); Thu, 17 Aug 2017 12:30:28 -0400
+Authentication-Results: mx1.messagingengine.com;
+    dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=DJRXq7Se;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=q4j4OOKP;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=fail (message has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=U7Pdj/LB
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx1.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx1.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Thu, 17 Aug 2017 12:30:27 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502987424; bh=P5C3gzzCdP/NQgV0POjgD3g9Hpun4leANxLktFzWpbo=;
+        h=In-Reply-To:References:From:Date:Subject:To:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=q4j4OOKPbM6MLGfTlM1WlnmVrh2PfQSKPYcLEoHUjBwoiu+oacbJb5cxmPkadvddx
+         MIYmJyog8F4NCNZCIi5vzNkit8vaUJgHws3pk+0uIFo9SdOBkFBfTXSGsDBWB2AdL5
+         wryEwxZKOqEDcECpTNEEmQykU3MYwLBw7sD+KJjY=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=2607:f8b0:4003:c06::232; helo=mail-oi0-x232.google.com;
+ envelope-from=kexipl@gmail.com; receiver=kde-community@kde.org 
+Authentication-Results: postbox.kde.org; dkim=pass
+ reason="2048-bit key; unprotected key"
+ header.d=gmail.com header.i=@gmail.com header.b=DJRXq7Se;
+ dkim-adsp=pass; dkim-atps=neutral
+Received: from mail-oi0-x232.google.com (mail-oi0-x232.google.com
+ [IPv6:2607:f8b0:4003:c06::232])
+ by postbox.kde.org (Postfix) with ESMTPS id A4F67A014D
+ for <kde-community@kde.org>; Thu, 17 Aug 2017 16:30:09 +0000 (UTC)
+Received: by mail-oi0-x232.google.com with SMTP id f11so71799456oic.0
+ for <kde-community@kde.org>; Thu, 17 Aug 2017 09:30:09 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
+ h=mime-version:sender:in-reply-to:references:from:date:message-id
+ :subject:to; bh=P5C3gzzCdP/NQgV0POjgD3g9Hpun4leANxLktFzWpbo=;
+ b=DJRXq7SewhEpbavrA6kFk0TPbF9526gl1WpH2O4R7hpuM5tJVqLoT4b53UfmZyGeDw
+ pSdW599ZTY3WLsK29IZ5buua1TgJeSLgN+PWKfTJAFW7qAZaJo6pRIpqSgETEEk/BdMc
+ KtqYdBD/IkwUVx5LAuQikyNn1HrKbti/tbc/YiI23f5TRxfIQZb7DOvOaAi1bZO8jEFq
+ 5EHEVcrjvIR2S4HHWxen9rZvGIotVN3womdK8b0t+Wx+Kt0qv06px9jNF0mTqLKhCJAz
+ los9Tpv/7RI0JiQyfPzl7kMQjU3i/pyA1u6b6t69ALfUQcjv25NcwhSaQbWIi9DN8rLg
+ Lc7g==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
+ :date:message-id:subject:to;
+ bh=P5C3gzzCdP/NQgV0POjgD3g9Hpun4leANxLktFzWpbo=;
+ b=U7Pdj/LBlwGbtXVpnpJudVk938b0fKTIRhK+Lc9IfB9zZhXh3FGwX5kWSUObEOT3hX
+ BXRk0cWvJYHpuGUnLXx/Wjen3j6283GHvDvPhfagyTZbGJohkRMEkxLwFh4ZsJ87M71t
+ pqLLayDjqDHj5jVuko5TDPTtRL8mjzPM7r0DQKu1GYkYtiNLE5JlGR9OsqK8ZH78Wkf8
+ PWUT2BD+mkOE03gFEYpTA0oQW1iwv+wN5xySzaUOlBVfxUUx69EOLnFuRthkQHXcnlGG
+ rchW44D/eiSVU7JWK1Tk2IKNK+ERiq2/zftSmKRzpbwfv6D8De0PZOJPyi89kS9t2I2L
+ ar9g==
+X-Gm-Message-State: AHYfb5g28N+JHV5G6R5j0X0hpMFpCnu/TuLNw/idrsMKyvGOUXdbQiIn
+ whIAqO9js0sL5H92k3yqqJIGhuicWA==
+X-Received: by 10.202.108.130 with SMTP id h124mr8149045oic.289.1502987407944; 
+ Thu, 17 Aug 2017 09:30:07 -0700 (PDT)
+MIME-Version: 1.0
+Received: by 10.182.45.227 with HTTP; Thu, 17 Aug 2017 09:29:27 -0700 (PDT)
+In-Reply-To: <5A696707-744C-4035-A8FA-CA83EE8691D6@kde.org>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+ <5231282.Ch11jfsTMl@lenovo> <B95D7D2A-23A9-4245-AAC0-8A3FAE330090@kde.org>
+ <5A696707-744C-4035-A8FA-CA83EE8691D6@kde.org>
+From: Jaroslaw Staniek <staniek@kde.org>
+Date: Thu, 17 Aug 2017 18:29:27 +0200
+X-Google-Sender-Auth: LxL4QEJfN3UTITM2I0VbgyX7420
+Message-ID: <CAOj7QQ0WsTCfu9hoq+DTKMGTW=+KObo7HG2_YU1QZ6eOGwQbAQ@mail.gmail.com>
+Subject: Re: Telemetry Policy
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+Content-Type: multipart/alternative; boundary="001a1142e7548d73010556f58604"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+--001a1142e7548d73010556f58604
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+On 17 August 2017 at 18:20, Thomas Pfeiffer <thomas.pfeiffer@kde.org> wrote=
+:
+
+>
+> On 17. Aug 2017, at 17:38, Mirko Boehm - KDE <mirko@kde.org> wrote:
+>
+> Hi,
+>
+> On 17. Aug 2017, at 01:46, Thomas Pfeiffer <thomas.pfeiffer@kde.org>
+> wrote:
+>
+> Hi Valorie,
+> Even if opt-out for some data is legally and even morally fine, it does n=
+ot
+>
+> align with the values we communicate to our users:
+> Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and we'=
+re
+>
+> striving to make privacy our USP.
+>
+>
+> We seem to assume a contradiction between telemetry and privacy. I believ=
+e
+> this is a knee-jerk reaction. We can implement telemetry in a way that
+> privacy is not violated. In fact, I would say that it follows from our
+> vision that we should do this.
+>
+>
+> The problem is: I expect users to have the same knee-jerk reaction. I
+> don=E2=80=99t see us being able to explain to users that actually their p=
+rivacy is
+> perfectly safe before they freak out.
+> Privacy-minded Free Software users have freaked out in the past over
+> things which objectively speaking were not a huge deal.
+> It=E2=80=99s emotion more than rational arguments
+>
+>
+=E2=80=8BIt's hard to argue here or generalize to all app's communities. Kr=
+ita
+community for example is different than gcc community in these aspects.
+
+--=20
+regards, Jaroslaw Staniek
+
+KDE:
+: A world-wide network of software engineers, artists, writers, translators
+: and facilitators committed to Free Software development - http://kde.org
+Calligra Suite:
+: A graphic art and office suite - http://calligra.org
+Kexi:
+: A visual database apps builder - http://calligra.org/kexi
+Qt Certified Specialist:
+: http://www.linkedin.com/in/jstaniek
+
+--001a1142e7548d73010556f58604
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-family:monospac=
+e,monospace;font-size:small"><br></div><div class=3D"gmail_extra"><br><div =
+class=3D"gmail_quote">On 17 August 2017 at 18:20, Thomas Pfeiffer <span dir=
+=3D"ltr">&lt;<a href=3D"mailto:thomas.pfeiffer@kde.org" target=3D"_blank">t=
+homas.pfeiffer@kde.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_=
+quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1=
+ex"><div style=3D"word-wrap:break-word"><br><div><span class=3D""><blockquo=
+te type=3D"cite"><div>On 17. Aug 2017, at 17:38, Mirko Boehm - KDE &lt;<a h=
+ref=3D"mailto:mirko@kde.org" target=3D"_blank">mirko@kde.org</a>&gt; wrote:=
+</div><br class=3D"m_-9083494930210199564Apple-interchange-newline"><div><d=
+iv style=3D"word-wrap:break-word">Hi,=C2=A0<div><br><div><blockquote type=
+=3D"cite"><div>On 17. Aug 2017, at 01:46, Thomas Pfeiffer &lt;<a href=3D"ma=
+ilto:thomas.pfeiffer@kde.org" target=3D"_blank">thomas.pfeiffer@kde.org</a>=
+&gt; wrote:</div><br class=3D"m_-9083494930210199564Apple-interchange-newli=
+ne"><div><span style=3D"font-family:Menlo-Regular;font-size:11px;font-style=
+:normal;font-variant-caps:normal;font-weight:normal;letter-spacing:normal;t=
+ext-align:start;text-indent:0px;text-transform:none;white-space:normal;word=
+-spacing:0px;float:none;display:inline!important">Hi Valorie,</span><br sty=
+le=3D"font-family:Menlo-Regular;font-size:11px;font-style:normal;font-varia=
+nt-caps:normal;font-weight:normal;letter-spacing:normal;text-align:start;te=
+xt-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><spa=
+n style=3D"font-family:Menlo-Regular;font-size:11px;font-style:normal;font-=
+variant-caps:normal;font-weight:normal;letter-spacing:normal;text-align:sta=
+rt;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;=
+float:none;display:inline!important">Even if opt-out for some data is legal=
+ly and even morally fine, it does not<span class=3D"m_-9083494930210199564A=
+pple-converted-space">=C2=A0</span></span><br style=3D"font-family:Menlo-Re=
+gular;font-size:11px;font-style:normal;font-variant-caps:normal;font-weight=
+:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transfo=
+rm:none;white-space:normal;word-spacing:0px"><span style=3D"font-family:Men=
+lo-Regular;font-size:11px;font-style:normal;font-variant-caps:normal;font-w=
+eight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-tr=
+ansform:none;white-space:normal;word-spacing:0px;float:none;display:inline!=
+important">align with the values we communicate to our users:</span><br sty=
+le=3D"font-family:Menlo-Regular;font-size:11px;font-style:normal;font-varia=
+nt-caps:normal;font-weight:normal;letter-spacing:normal;text-align:start;te=
+xt-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><spa=
+n style=3D"font-family:Menlo-Regular;font-size:11px;font-style:normal;font-=
+variant-caps:normal;font-weight:normal;letter-spacing:normal;text-align:sta=
+rt;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;=
+float:none;display:inline!important">Unlike Mozilla&#39;s Mission, our Visi=
+on mentions privacy explicitly, and we&#39;re<span class=3D"m_-908349493021=
+0199564Apple-converted-space">=C2=A0</span></span><br style=3D"font-family:=
+Menlo-Regular;font-size:11px;font-style:normal;font-variant-caps:normal;fon=
+t-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text=
+-transform:none;white-space:normal;word-spacing:0px"><span style=3D"font-fa=
+mily:Menlo-Regular;font-size:11px;font-style:normal;font-variant-caps:norma=
+l;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px=
+;text-transform:none;white-space:normal;word-spacing:0px;float:none;display=
+:inline!important">striving to make privacy our USP.</span><br style=3D"fon=
+t-family:Menlo-Regular;font-size:11px;font-style:normal;font-variant-caps:n=
+ormal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent=
+:0px;text-transform:none;white-space:normal;word-spacing:0px"></div></block=
+quote><br></div><div>We seem to assume a contradiction between telemetry an=
+d privacy. I believe this is a knee-jerk reaction. We can implement telemet=
+ry in a way that privacy is not violated. In fact, I would say that it foll=
+ows from our vision that we should do this.</div><div><br></div></div></div=
+></div></blockquote><div><br></div></span>The problem is: I expect users to=
+ have the same knee-jerk reaction. I don=E2=80=99t see us being able to exp=
+lain to users that actually their privacy is perfectly safe before they fre=
+ak out.</div><div>Privacy-minded Free Software users have freaked out in th=
+e past over things which objectively speaking were not a huge deal.</div><d=
+iv>It=E2=80=99s emotion more than rational arguments</div><br></div></block=
+quote></div><br><div class=3D"gmail_default" style=3D"font-family:monospace=
+,monospace;font-size:small">=E2=80=8BIt&#39;s hard to argue here or general=
+ize to all app&#39;s communities. Krita community for example is different =
+than gcc community in these aspects.</div><div><br></div>-- <br><div class=
+=3D"gmail_signature" data-smartmail=3D"gmail_signature">regards, Jaroslaw S=
+taniek<br><br>KDE:<br>: A world-wide network of software engineers, artists=
+, writers, translators<br>: and facilitators committed to Free Software dev=
+elopment - <a href=3D"http://kde.org" target=3D"_blank">http://kde.org</a><=
+br>Calligra Suite:<br>: A graphic art and office suite - <a href=3D"http://=
+calligra.org" target=3D"_blank">http://calligra.org</a><br>Kexi:<br>: A vis=
+ual database apps builder - <a href=3D"http://calligra.org/kexi" target=3D"=
+_blank">http://calligra.org/kexi</a><br>Qt Certified Specialist:<br>: <a hr=
+ef=3D"http://www.linkedin.com/in/jstaniek" target=3D"_blank">http://www.lin=
+kedin.com/in/jstaniek</a></div>
+</div></div>
+
+--001a1142e7548d73010556f58604--