[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Reorganize code for split
From:       Montel Laurent <montel () kde ! org>
Date:       2015-11-30 19:59:12
Message-ID: E1a3UbQ-0003Hd-8Q () scm ! kde ! org
[Download RAW message or body]

Git commit 7c4171fc24714a651d64282f0fb6e6356a50f4f4 by Montel Laurent.
Committed on 30/11/2015 at 17:24.
Pushed by mlaurent into branch 'master'.

Reorganize code for split

M  +5    -20   CMakeLists.txt
A  +10   -0    kdepim-apps-lib/CMakeLists.txt
R  +1    -1    kdepim-apps-lib/composereditor-ng/CMakeLists.txt [from: \
composereditor-ng/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in [from: \
composereditor-ng/KF5ComposerEditorNGConfig.cmake.in - 100% similarity] R  +0    -0   \
kdepim-apps-lib/composereditor-ng/TODO [from: composereditor-ng/TODO - 100% \
similarity] R  +1    -1    kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt \
[from: composereditor-ng/src/CMakeLists.txt - 098% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/Messages.sh [from: \
composereditor-ng/src/Messages.sh - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/composereditor-ng.kcfg [from: \
composereditor-ng/src/composereditor-ng.kcfg - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/composereditor.cpp [from: \
composereditor-ng/src/composereditor.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/composereditor.h [from: \
composereditor-ng/src/composereditor.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/composerview.cpp [from: \
composereditor-ng/src/composerview.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/composerview.h [from: \
composereditor-ng/src/composerview.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/data/composereditorinitialhtml [from: \
composereditor-ng/src/data/composereditorinitialhtml - 100% similarity] R  +0    -0   \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.cpp \
[from: composereditor-ng/src/extendattributes/extendattributesbutton.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.h \
[from: composereditor-ng/src/extendattributes/extendattributesbutton.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.cpp \
[from: composereditor-ng/src/extendattributes/extendattributesdialog.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.h \
[from: composereditor-ng/src/extendattributes/extendattributesdialog.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils.cpp \
[from: composereditor-ng/src/extendattributes/extendattributesutils.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils_p.h \
[from: composereditor-ng/src/extendattributes/extendattributesutils_p.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.cpp \
[from: composereditor-ng/src/extendattributes/extendattributeswidget.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.h \
[from: composereditor-ng/src/extendattributes/extendattributeswidget.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/globalsetting_composereditorng.kcfgc [from: \
composereditor-ng/src/globalsetting_composereditorng.kcfgc - 100% similarity] R  +0   \
-0    kdepim-apps-lib/composereditor-ng/src/helper/listhelper.cpp [from: \
composereditor-ng/src/helper/listhelper.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/helper/listhelper_p.h [from: \
composereditor-ng/src/helper/listhelper_p.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/helper/tablehelper.cpp [from: \
composereditor-ng/src/helper/tablehelper.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/helper/tablehelper_p.h [from: \
composereditor-ng/src/helper/tablehelper_p.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.cpp [from: \
composereditor-ng/src/image/composerimagedialog.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.h [from: \
composereditor-ng/src/image/composerimagedialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.cpp [from: \
composereditor-ng/src/image/composerimageresizetooltip.cpp - 100% similarity] R  +0   \
-0    kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.h [from: \
composereditor-ng/src/image/composerimageresizetooltip.h - 100% similarity] R  +0    \
-0    kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.cpp \
[from: composereditor-ng/src/image/composerimageresizewidget.cpp - 100% similarity] R \
+0    -0    kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.h \
[from: composereditor-ng/src/image/composerimageresizewidget.h - 100% similarity] R  \
+0    -0    kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.cpp \
[from: composereditor-ng/src/link/composeranchordialog.cpp - 100% similarity] R  +0   \
-0    kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.h [from: \
composereditor-ng/src/link/composeranchordialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.cpp [from: \
composereditor-ng/src/link/composerlinkdialog.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.h [from: \
composereditor-ng/src/link/composerlinkdialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.cpp [from: \
composereditor-ng/src/list/composerlistdialog.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.h [from: \
composereditor-ng/src/list/composerlistdialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp [from: \
composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp - 100% similarity] R  \
+0    -0    kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h \
[from: composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h - 100% similarity] \
R  +0    -0    kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp \
[from: composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h [from: \
composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h - 100% similarity] R  +0  \
-0    kdepim-apps-lib/composereditor-ng/src/private/composerview_p.cpp [from: \
composereditor-ng/src/private/composerview_p.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/private/composerview_p.h [from: \
composereditor-ng/src/private/composerview_p.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.cpp [from: \
composereditor-ng/src/table/composercellsizewidget.cpp - 100% similarity] R  +0    -0 \
kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.h [from: \
composereditor-ng/src/table/composercellsizewidget.h - 100% similarity] R  +0    -0   \
kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.cpp [from: \
composereditor-ng/src/table/composertableactionmenu.cpp - 100% similarity] R  +0    \
-0    kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.h [from: \
composereditor-ng/src/table/composertableactionmenu.h - 100% similarity] R  +0    -0  \
kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.cpp [from: \
composereditor-ng/src/table/composertablecellformatdialog.cpp - 100% similarity] R  \
+0    -0    kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.h \
[from: composereditor-ng/src/table/composertablecellformatdialog.h - 100% similarity] \
R  +0    -0    kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.cpp \
[from: composereditor-ng/src/table/composertabledialog.cpp - 100% similarity] R  +0   \
-0    kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.h [from: \
composereditor-ng/src/table/composertabledialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.cpp [from: \
composereditor-ng/src/table/composertableformatdialog.cpp - 100% similarity] R  +0    \
-0    kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.h [from: \
composereditor-ng/src/table/composertableformatdialog.h - 100% similarity] R  +0    \
-0    kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.cpp \
[from: composereditor-ng/src/table/composertableresizewidget.cpp - 100% similarity] R \
+0    -0    kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.h \
[from: composereditor-ng/src/table/composertableresizewidget.h - 100% similarity] R  \
+0    -0    kdepim-apps-lib/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui \
[from: composereditor-ng/src/ui/pagecolorbackgroundwidget.ui - 100% similarity] R  +0 \
-0    kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils.cpp [from: \
composereditor-ng/src/utils/composereditorutils.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils_p.h [from: \
composereditor-ng/src/utils/composereditorutils_p.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.cpp [from: \
composereditor-ng/src/widgets/domtreewidget.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.h [from: \
composereditor-ng/src/widgets/domtreewidget.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.cpp [from: \
composereditor-ng/src/widgets/findreplacebar.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.h [from: \
composereditor-ng/src/widgets/findreplacebar.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/tests/CMakeLists.txt [from: \
composereditor-ng/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.cpp [from: \
composereditor-ng/tests/composerhtmleditor.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.h [from: \
composereditor-ng/tests/composerhtmleditor.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/tests/composerhtmleditorui.rc [from: \
composereditor-ng/tests/composerhtmleditorui.rc - 100% similarity] R  +0    -0    \
kdepim-apps-lib/composereditor-ng/tests/main.cpp [from: \
composereditor-ng/tests/main.cpp - 100% similarity] R  +1    -1    \
kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt [from: \
kaddressbookgrantlee/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in [from: \
kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in - 100% similarity] R  +1  \
-1    kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt [from: \
kaddressbookgrantlee/src/CMakeLists.txt - 098% similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/Messages.sh [from: \
kaddressbookgrantlee/src/Messages.sh - 100% similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp \
[from: kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h [from: \
kaddressbookgrantlee/src/formatter/grantleecontactformatter.h - 100% similarity] R  \
+0    -0    kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp \
[from: kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h \
[from: kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp [from: \
kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp - 100% similarity] R  +0  \
-0    kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.h \
[from: kaddressbookgrantlee/src/formatter/grantleecontactutils.h - 100% similarity] R \
+0    -0    kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt \
[from: kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt - 100% similarity] \
R  +0    -0    kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp \
[from: kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h \
[from: kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h [from: \
kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h - 100% similarity] R  \
+0    -0    kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp \
[from: kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp - 100% \
R  +0    -0    kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.cpp \
[from: kaddressbookgrantlee/src/printing/grantleeprint.cpp - 100% similarity] R  +0   \
-0    kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.h [from: \
kaddressbookgrantlee/src/printing/grantleeprint.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp [from: \
kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp - 100% similarity] R  +0    \
-0    kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.h [from: \
kaddressbookgrantlee/src/widget/grantleecontactviewer.h - 100% similarity] R  +1    \
-1    kdepim-apps-lib/libfollowupreminder/CMakeLists.txt [from: \
libfollowupreminder/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/KF5FollowupReminderConfig.cmake.in [from: \
libfollowupreminder/KF5FollowupReminderConfig.cmake.in - 100% similarity] R  +0    -0 \
kdepim-apps-lib/libfollowupreminder/KF5SendLaterConfig.cmake.in [from: \
libfollowupreminder/KF5SendLaterConfig.cmake.in - 100% similarity] R  +1    -1    \
kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt [from: \
libfollowupreminder/src/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/Messages.sh [from: \
libfollowupreminder/src/Messages.sh - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.cpp [from: \
libfollowupreminder/src/followupreminderinfo.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.h [from: \
libfollowupreminder/src/followupreminderinfo.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.cpp [from: \
libfollowupreminder/src/followupreminderutil.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.h [from: \
libfollowupreminder/src/followupreminderutil.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg \
[from: libfollowupreminder/src/settings/followupreminderagentsettings.kcfg - 100% \
similarity] R  +0    -0    \
kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc \
[from: libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc - 100% \
similarity] R  +1    -1    kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt \
[from: libkdepimdbusinterfaces/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in [from: \
libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in - 100% similarity] R  \
+1    -1    kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt [from: \
libkdepimdbusinterfaces/src/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h [from: \
libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h - 100% similarity] R  +0    -0  \
kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml \
[from: libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml - \
100% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml \
[from: libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml - \
100% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.cpp [from: \
libkdepimdbusinterfaces/src/reminderclient.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.h [from: \
libkdepimdbusinterfaces/src/reminderclient.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.cpp [from: \
libkdepimdbusinterfaces/src/urihandler.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.h [from: \
libkdepimdbusinterfaces/src/urihandler.h - 100% similarity] R  +1    -1    \
kdepim-apps-lib/libsendlater/CMakeLists.txt [from: libsendlater/CMakeLists.txt - 097% \
similarity] R  +0    -0    kdepim-apps-lib/libsendlater/KF5SendLaterConfig.cmake.in \
[from: libsendlater/KF5SendLaterConfig.cmake.in - 100% similarity] R  +1    -1    \
kdepim-apps-lib/libsendlater/src/CMakeLists.txt [from: \
libsendlater/src/CMakeLists.txt - 097% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/Messages.sh [from: libsendlater/src/Messages.sh - \
100% similarity] R  +0    -0    kdepim-apps-lib/libsendlater/src/sendlaterdialog.cpp \
[from: libsendlater/src/sendlaterdialog.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlaterdialog.h [from: \
libsendlater/src/sendlaterdialog.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlaterinfo.cpp [from: \
libsendlater/src/sendlaterinfo.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlaterinfo.h [from: \
libsendlater/src/sendlaterinfo.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.cpp [from: \
libsendlater/src/sendlatertimedatewidget.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.h [from: \
libsendlater/src/sendlatertimedatewidget.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlaterutil.cpp [from: \
libsendlater/src/sendlaterutil.cpp - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/sendlaterutil.h [from: \
libsendlater/src/sendlaterutil.h - 100% similarity] R  +0    -0    \
kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfg [from: \
libsendlater/src/settings/sendlateragentsettings.kcfg - 100% similarity] R  +0    -0  \
kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfgc [from: \
libsendlater/src/settings/sendlateragentsettings.kcfgc - 100% similarity] R  +0    -0 \
kdepim-apps-lib/libsendlater/src/ui/sendlaterwidget.ui [from: \
libsendlater/src/ui/sendlaterwidget.ui - 100% similarity] M  +0    -1    \
mailcommon/CMakeLists.txt A  +14   -0    messagelib/CMakeLists.txt
C  +0    -0    messagelib/cmake/modules/FindGpgme.cmake [from: \
messageviewer/cmake/modules/FindGpgme.cmake - 100% similarity] C  +0    -0    \
messagelib/cmake/modules/kdepim_add_gpg_crypto_test.cmake [from: \
messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake - 100% similarity] C  \
+0    -0    messagelib/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake [from: \
messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake - 100% \
similarity] R  +2    -5    messagelib/messagecomposer/CMakeLists.txt [from: \
messagecomposer/CMakeLists.txt - 093% similarity] R  +0    -0    \
messagelib/messagecomposer/DESIGN [from: messagecomposer/DESIGN - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/KF5MessageComposerConfig.cmake.in [from: \
messagecomposer/KF5MessageComposerConfig.cmake.in - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/TODO [from: messagecomposer/TODO - 100% similarity] R  +0  \
-0    messagelib/messagecomposer/autotests/CMakeLists.txt [from: \
messagecomposer/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachmentjobtest.cpp [from: \
messagecomposer/autotests/attachmentjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachmentjobtest.h [from: \
messagecomposer/autotests/attachmentjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachments/ascii.txt [from: \
messagecomposer/autotests/attachments/ascii.txt - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachments/iso8859-2.txt [from: \
messagecomposer/autotests/attachments/iso8859-2.txt - 100% similarity] R  +-    --    \
messagelib/messagecomposer/autotests/attachments/utf16.txt [from: \
messagecomposer/autotests/attachments/utf16.txt - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp [from: \
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h [from: \
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h - 100% similarity] \
R  +0    -0    messagelib/messagecomposer/autotests/composertest.cpp [from: \
messagecomposer/autotests/composertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/composertest.h [from: \
messagecomposer/autotests/composertest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/composerviewbasetest.cpp [from: \
messagecomposer/autotests/composerviewbasetest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/composerviewbasetest.h [from: \
messagecomposer/autotests/composerviewbasetest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/cryptocomposertest.cpp [from: \
messagecomposer/autotests/cryptocomposertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/cryptocomposertest.h [from: \
messagecomposer/autotests/cryptocomposertest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/cryptofunctions.cpp [from: \
messagecomposer/autotests/cryptofunctions.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/cryptofunctions.h [from: \
messagecomposer/autotests/cryptofunctions.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/data/html_utf8_encoded.mbox [from: \
messagecomposer/autotests/data/html_utf8_encoded.mbox - 100% similarity] R  +0    -0  \
messagelib/messagecomposer/autotests/data/plain_message.mbox [from: \
messagecomposer/autotests/data/plain_message.mbox - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/data/plain_utf16.mbox [from: \
messagecomposer/autotests/data/plain_utf16.mbox - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/encryptjobtest.cpp [from: \
messagecomposer/autotests/encryptjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/encryptjobtest.h [from: \
messagecomposer/autotests/encryptjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp [from: \
messagecomposer/autotests/followupreminderselectdatedialogtest.cpp - 100% similarity] \
R  +0    -0    messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.h \
[from: messagecomposer/autotests/followupreminderselectdatedialogtest.h - 100% \
similarity] R  +0    -0    messagelib/messagecomposer/autotests/globalparttest.cpp \
[from: messagecomposer/autotests/globalparttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/globalparttest.h [from: \
messagecomposer/autotests/globalparttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/infoparttest.cpp [from: \
messagecomposer/autotests/infoparttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/infoparttest.h [from: \
messagecomposer/autotests/infoparttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/maintextjobtest.cpp [from: \
messagecomposer/autotests/maintextjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/maintextjobtest.h [from: \
messagecomposer/autotests/maintextjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/messagefactorytest.cpp [from: \
messagecomposer/autotests/messagefactorytest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/messagefactorytest.h [from: \
messagecomposer/autotests/messagefactorytest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/multipartjobtest.cpp [from: \
messagecomposer/autotests/multipartjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/multipartjobtest.h [from: \
messagecomposer/autotests/multipartjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/qtest_messagecomposer.h [from: \
messagecomposer/autotests/qtest_messagecomposer.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/setupenv.cpp [from: \
messagecomposer/autotests/setupenv.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/setupenv.h [from: \
messagecomposer/autotests/setupenv.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/signencrypttest.cpp [from: \
messagecomposer/autotests/signencrypttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/signencrypttest.h [from: \
messagecomposer/autotests/signencrypttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/signjobtest.cpp [from: \
messagecomposer/autotests/signjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/signjobtest.h [from: \
messagecomposer/autotests/signjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/singlepartjobtest.cpp [from: \
messagecomposer/autotests/singlepartjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/singlepartjobtest.h [from: \
messagecomposer/autotests/singlepartjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/skeletonmessagejobtest.cpp [from: \
messagecomposer/autotests/skeletonmessagejobtest.cpp - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/autotests/skeletonmessagejobtest.h [from: \
messagecomposer/autotests/skeletonmessagejobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/testcsshelper.h [from: \
messagecomposer/autotests/testcsshelper.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/testhtmlwriter.h [from: \
messagecomposer/autotests/testhtmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/textparttest.cpp [from: \
messagecomposer/autotests/textparttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/textparttest.h [from: \
messagecomposer/autotests/textparttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/unittestenv/config-sqlite-db.xml [from: \
messagecomposer/autotests/unittestenv/config-sqlite-db.xml - 100% similarity] R  +0   \
-0    messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
[from: messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
- 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc [from: \
messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc - 100% \
similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc [from: \
messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc - 100% similarity] \
R  +0    -0    messagelib/messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
[from: messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
- 100% similarity] R  +0    -0    messagelib/messagecomposer/autotests/utiltest.cpp \
[from: messagecomposer/autotests/utiltest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/autotests/utiltest.h [from: \
messagecomposer/autotests/utiltest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake [from: \
messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake - 100% similarity] R  +0 \
-0    messagelib/messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
[from: messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake - 100% \
similarity] R  +1    -1    messagelib/messagecomposer/src/CMakeLists.txt [from: \
messagecomposer/src/CMakeLists.txt - 099% similarity] R  +0    -0    \
messagelib/messagecomposer/src/COMPLIANCE [from: messagecomposer/src/COMPLIANCE - \
100% similarity] R  +0    -0    messagelib/messagecomposer/src/Messages.sh [from: \
messagecomposer/src/Messages.sh - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.cpp [from: \
messagecomposer/src/attachment/attachmentcontrollerbase.cpp - 100% similarity] R  +0  \
-0    messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.h [from: \
messagecomposer/src/attachment/attachmentcontrollerbase.h - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/attachment/attachmentmodel.cpp [from: \
messagecomposer/src/attachment/attachmentmodel.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/attachment/attachmentmodel.h [from: \
messagecomposer/src/attachment/attachmentmodel.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer-ng/richtextcomposerng.cpp [from: \
messagecomposer/src/composer-ng/richtextcomposerng.cpp - 100% similarity] R  +0    -0 \
messagelib/messagecomposer/src/composer-ng/richtextcomposerng.h [from: \
messagecomposer/src/composer-ng/richtextcomposerng.h - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp [from: \
messagecomposer/src/composer-ng/richtextcomposersignatures.cpp - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.h \
[from: messagecomposer/src/composer-ng/richtextcomposersignatures.h - 100% \
similarity] R  +0    -0    messagelib/messagecomposer/src/composer/composer.cpp \
[from: messagecomposer/src/composer/composer.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/composer.h [from: \
messagecomposer/src/composer/composer.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/composerlineedit.cpp [from: \
messagecomposer/src/composer/composerlineedit.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/composerlineedit.h [from: \
messagecomposer/src/composer/composerlineedit.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/composerviewbase.cpp [from: \
messagecomposer/src/composer/composerviewbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/composerviewbase.h [from: \
messagecomposer/src/composer/composerviewbase.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/keyresolver.cpp [from: \
messagecomposer/src/composer/keyresolver.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/keyresolver.h [from: \
messagecomposer/src/composer/keyresolver.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/composer/signaturecontroller.cpp [from: \
messagecomposer/src/composer/signaturecontroller.cpp - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/composer/signaturecontroller.h [from: \
messagecomposer/src/composer/signaturecontroller.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.cpp [from: \
messagecomposer/src/followupreminder/followupremindercreatejob.cpp - 100% similarity] \
R  +0    -0    messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.h \
[from: messagecomposer/src/followupreminder/followupremindercreatejob.h - 100% \
similarity] R  +0    -0    \
messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp \
[from: messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp - \
100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h \
[from: messagecomposer/src/followupreminder/followupreminderselectdatedialog.h - 100% \
similarity] R  +0    -0    messagelib/messagecomposer/src/helper/messagefactory.cpp \
[from: messagecomposer/src/helper/messagefactory.cpp - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/helper/messagefactory.h [from: \
messagecomposer/src/helper/messagefactory.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/helper/messagehelper.cpp [from: \
messagecomposer/src/helper/messagehelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/helper/messagehelper.h [from: \
messagecomposer/src/helper/messagehelper.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/imagescaling/autotests/CMakeLists.txt [from: \
messagecomposer/src/imagescaling/autotests/CMakeLists.txt - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp \
[from: messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.h [from: \
messagecomposer/src/imagescaling/autotests/imagescalingtest.h - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/src/imagescaling/imagescaling.cpp [from: \
messagecomposer/src/imagescaling/imagescaling.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/imagescaling/imagescaling.h [from: \
messagecomposer/src/imagescaling/imagescaling.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.cpp [from: \
messagecomposer/src/imagescaling/imagescalingselectformat.cpp - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.h \
R  +0    -0    messagelib/messagecomposer/src/imagescaling/imagescalingutils.h [from: \
messagecomposer/src/imagescaling/imagescalingutils.h - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/imagescaling/imagescalingwidget.cpp [from: \
messagecomposer/src/imagescaling/imagescalingwidget.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/imagescaling/imagescalingwidget.h [from: \
messagecomposer/src/imagescaling/imagescalingwidget.h - 100% similarity] R  +0    -0  \
messagelib/messagecomposer/src/imagescaling/tests/CMakeLists.txt [from: \
messagecomposer/src/imagescaling/tests/CMakeLists.txt - 100% similarity] R  +0    -0  \
messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp [from: \
messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp - 100% similarity] R  +0  \
-0    messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.h [from: \
messagecomposer/src/imagescaling/tests/imagescaling_gui.h - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/imagescaling/ui/imagescalingwidget.ui [from: \
messagecomposer/src/imagescaling/ui/imagescalingwidget.ui - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/job/abstractencryptjob.h [from: \
messagecomposer/src/job/abstractencryptjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/aliasesexpandjob.cpp [from: \
messagecomposer/src/job/aliasesexpandjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/aliasesexpandjob.h [from: \
messagecomposer/src/job/aliasesexpandjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.cpp [from: \
messagecomposer/src/job/attachmentfrompublickeyjob.cpp - 100% similarity] R  +0    -0 \
messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.h [from: \
messagecomposer/src/job/attachmentfrompublickeyjob.h - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/job/attachmentjob.cpp [from: \
messagecomposer/src/job/attachmentjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/attachmentjob.h [from: \
messagecomposer/src/job/attachmentjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp [from: \
messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h \
[from: messagecomposer/src/job/attachmentvcardfromaddressbookjob.h - 100% similarity] \
R  +0    -0    messagelib/messagecomposer/src/job/contentjobbase.cpp [from: \
messagecomposer/src/job/contentjobbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/contentjobbase.h [from: \
messagecomposer/src/job/contentjobbase.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/contentjobbase_p.h [from: \
messagecomposer/src/job/contentjobbase_p.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/distributionlistexpandjob.cpp [from: \
messagecomposer/src/job/distributionlistexpandjob.cpp - 100% similarity] R  +0    -0  \
messagelib/messagecomposer/src/job/distributionlistexpandjob.h [from: \
messagecomposer/src/job/distributionlistexpandjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/emailaddressresolvejob.cpp [from: \
messagecomposer/src/job/emailaddressresolvejob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/emailaddressresolvejob.h [from: \
messagecomposer/src/job/emailaddressresolvejob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/encryptjob.cpp [from: \
messagecomposer/src/job/encryptjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/encryptjob.h [from: \
messagecomposer/src/job/encryptjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/inserttextfilejob.cpp [from: \
messagecomposer/src/job/inserttextfilejob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/inserttextfilejob.h [from: \
messagecomposer/src/job/inserttextfilejob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/jobbase.cpp [from: \
messagecomposer/src/job/jobbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/jobbase.h [from: messagecomposer/src/job/jobbase.h \
- 100% similarity] R  +0    -0    messagelib/messagecomposer/src/job/jobbase_p.h \
[from: messagecomposer/src/job/jobbase_p.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/maintextjob.cpp [from: \
messagecomposer/src/job/maintextjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/maintextjob.h [from: \
messagecomposer/src/job/maintextjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/multipartjob.cpp [from: \
messagecomposer/src/job/multipartjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/multipartjob.h [from: \
messagecomposer/src/job/multipartjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/savecontactpreferencejob.cpp [from: \
messagecomposer/src/job/savecontactpreferencejob.cpp - 100% similarity] R  +0    -0   \
messagelib/messagecomposer/src/job/savecontactpreferencejob.h [from: \
messagecomposer/src/job/savecontactpreferencejob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/signencryptjob.cpp [from: \
messagecomposer/src/job/signencryptjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/signencryptjob.h [from: \
messagecomposer/src/job/signencryptjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/signjob.cpp [from: \
messagecomposer/src/job/signjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/signjob.h [from: messagecomposer/src/job/signjob.h \
- 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/singlepartjob.cpp [from: \
messagecomposer/src/job/singlepartjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/singlepartjob.h [from: \
messagecomposer/src/job/singlepartjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/skeletonmessagejob.cpp [from: \
messagecomposer/src/job/skeletonmessagejob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/skeletonmessagejob.h [from: \
messagecomposer/src/job/skeletonmessagejob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/transparentjob.cpp [from: \
messagecomposer/src/job/transparentjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/job/transparentjob.h [from: \
messagecomposer/src/job/transparentjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/kdepim-version.h.cmake [from: \
messagecomposer/src/kdepim-version.h.cmake - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/globalpart.cpp [from: \
messagecomposer/src/part/globalpart.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/globalpart.h [from: \
messagecomposer/src/part/globalpart.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/infopart.cpp [from: \
messagecomposer/src/part/infopart.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/infopart.h [from: \
messagecomposer/src/part/infopart.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/messagepart.cpp [from: \
messagecomposer/src/part/messagepart.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/messagepart.h [from: \
messagecomposer/src/part/messagepart.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/textpart.cpp [from: \
messagecomposer/src/part/textpart.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/part/textpart.h [from: \
messagecomposer/src/part/textpart.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/distributionlistdialog.cpp [from: \
messagecomposer/src/recipient/distributionlistdialog.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/recipient/distributionlistdialog.h [from: \
messagecomposer/src/recipient/distributionlistdialog.h - 100% similarity] R  +0    -0 \
messagelib/messagecomposer/src/recipient/kwindowpositioner.cpp [from: \
messagecomposer/src/recipient/kwindowpositioner.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/kwindowpositioner.h [from: \
messagecomposer/src/recipient/kwindowpositioner.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipient.cpp [from: \
messagecomposer/src/recipient/recipient.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipient.h [from: \
messagecomposer/src/recipient/recipient.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientline.cpp [from: \
messagecomposer/src/recipient/recipientline.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientline.h [from: \
messagecomposer/src/recipient/recipientline.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientseditor.cpp [from: \
messagecomposer/src/recipient/recipientseditor.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientseditor.h [from: \
messagecomposer/src/recipient/recipientseditor.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.cpp [from: \
messagecomposer/src/recipient/recipientseditorsidewidget.cpp - 100% similarity] R  +0 \
-0    messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.h [from: \
messagecomposer/src/recipient/recipientseditorsidewidget.h - 100% similarity] R  +0   \
-0    messagelib/messagecomposer/src/recipient/recipientspicker.cpp [from: \
messagecomposer/src/recipient/recipientspicker.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/recipient/recipientspicker.h [from: \
messagecomposer/src/recipient/recipientspicker.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/sender/akonadisender.cpp [from: \
messagecomposer/src/sender/akonadisender.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/sender/akonadisender.h [from: \
messagecomposer/src/sender/akonadisender.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/sender/messagesender.h [from: \
messagecomposer/src/sender/messagesender.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/settings/messagecomposer.kcfg.cmake [from: \
messagecomposer/src/settings/messagecomposer.kcfg.cmake - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/settings/messagecomposersettings.cpp [from: \
messagecomposer/src/settings/messagecomposersettings.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecomposer/src/settings/messagecomposersettings.h [from: \
messagecomposer/src/settings/messagecomposersettings.h - 100% similarity] R  +0    -0 \
messagelib/messagecomposer/src/settings/messagecomposersettings_base.kcfgc [from: \
messagecomposer/src/settings/messagecomposersettings_base.kcfgc - 100% similarity] R  \
+0    -0    messagelib/messagecomposer/src/utils/kleo_util.h [from: \
messagecomposer/src/utils/kleo_util.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/utils/util.cpp [from: \
messagecomposer/src/utils/util.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/src/utils/util.h [from: messagecomposer/src/utils/util.h - \
100% similarity] R  +0    -0    messagelib/messagecomposer/tests/CMakeLists.txt \
[from: messagecomposer/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/tests/recipientseditortest.cpp [from: \
messagecomposer/tests/recipientseditortest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/tests/recipientseditortest.h [from: \
messagecomposer/tests/recipientseditortest.h - 100% similarity] R  +0    -0    \
messagelib/messagecomposer/tests/testcomposerlineedit.cpp [from: \
messagecomposer/tests/testcomposerlineedit.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/.krazy [from: messagecore/.krazy - 100% similarity] R  +1    \
-1    messagelib/messagecore/CMakeLists.txt [from: messagecore/CMakeLists.txt - 098% \
similarity] R  +0    -0    messagelib/messagecore/KF5MessageCoreConfig.cmake.in \
[from: messagecore/KF5MessageCoreConfig.cmake.in - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/CMakeLists.txt [from: \
messagecore/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentcompressjobtest.cpp [from: \
messagecore/autotests/attachmentcompressjobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentcompressjobtest.h [from: \
messagecore/autotests/attachmentcompressjobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.cpp [from: \
messagecore/autotests/attachmentfrommimecontentjobtest.cpp - 100% similarity] R  +0   \
-0    messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.h [from: \
messagecore/autotests/attachmentfrommimecontentjobtest.h - 100% similarity] R  +0    \
-0    messagelib/messagecore/autotests/attachmentfromurljobtest.cpp [from: \
messagecore/autotests/attachmentfromurljobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentfromurljobtest.h [from: \
messagecore/autotests/attachmentfromurljobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentparttest.cpp [from: \
messagecore/autotests/attachmentparttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentparttest.h [from: \
messagecore/autotests/attachmentparttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentpropertiesdialogtest.cpp [from: \
messagecore/autotests/attachmentpropertiesdialogtest.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecore/autotests/attachmentpropertiesdialogtest.h [from: \
messagecore/autotests/attachmentpropertiesdialogtest.h - 100% similarity] R  +-    -- \
messagelib/messagecore/autotests/attachments/doc.pdf [from: \
messagecore/autotests/attachments/doc.pdf - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachments/file.txt [from: \
messagecore/autotests/attachments/file.txt - 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/attachments/image.png [from: \
messagecore/autotests/attachments/image.png - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentupdatejobtest.cpp [from: \
messagecore/autotests/attachmentupdatejobtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/attachmentupdatejobtest.h [from: \
messagecore/autotests/attachmentupdatejobtest.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/CMakeLists.txt [from: \
messagecore/autotests/gnupg_home/CMakeLists.txt - 100% similarity] R  +0    -0    \
R  +-    --    messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db \
[from: messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db \
- 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db \
[from: messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db \
- 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/dirmngr.conf [from: \
messagecore/autotests/gnupg_home/dirmngr.conf - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/gpg-agent.conf.in [from: \
messagecore/autotests/gnupg_home/gpg-agent.conf.in - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/gpg.conf [from: \
messagecore/autotests/gnupg_home/gpg.conf - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/gpgsm.conf.in [from: \
messagecore/autotests/gnupg_home/gpgsm.conf.in - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/pinentry-fake.sh [from: \
messagecore/autotests/gnupg_home/pinentry-fake.sh - 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key \
[from: messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key \
- 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/pubring.gpg [from: \
messagecore/autotests/gnupg_home/pubring.gpg - 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/pubring.kbx [from: \
messagecore/autotests/gnupg_home/pubring.kbx - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/scdaemon.conf [from: \
messagecore/autotests/gnupg_home/scdaemon.conf - 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/secring.gpg [from: \
messagecore/autotests/gnupg_home/secring.gpg - 100% similarity] R  +-    --    \
messagelib/messagecore/autotests/gnupg_home/trustdb.gpg [from: \
messagecore/autotests/gnupg_home/trustdb.gpg - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/gnupg_home/trustlist.txt [from: \
messagecore/autotests/gnupg_home/trustlist.txt - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/mailinglisttest.cpp [from: \
messagecore/autotests/mailinglisttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/mailinglisttest.h [from: \
messagecore/autotests/mailinglisttest.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/qtest_messagecore.h [from: \
messagecore/autotests/qtest_messagecore.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/stringutiltest.cpp [from: \
messagecore/autotests/stringutiltest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/autotests/stringutiltest.h [from: \
messagecore/autotests/stringutiltest.h - 100% similarity] R  +1    -1    \
messagelib/messagecore/src/CMakeLists.txt [from: messagecore/src/CMakeLists.txt - \
098% similarity] R  +0    -0    messagelib/messagecore/src/Messages.sh [from: \
messagecore/src/Messages.sh - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/README [from: messagecore/src/README - 100% similarity] R  \
+0    -0    messagelib/messagecore/src/attachment/attachmentcompressjob.cpp [from: \
messagecore/src/attachment/attachmentcompressjob.cpp - 100% similarity] R  +0    -0   \
messagelib/messagecore/src/attachment/attachmentcompressjob.h [from: \
messagecore/src/attachment/attachmentcompressjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentfromfolderjob.cpp [from: \
messagecore/src/attachment/attachmentfromfolderjob.cpp - 100% similarity] R  +0    -0 \
messagelib/messagecore/src/attachment/attachmentfromfolderjob.h [from: \
messagecore/src/attachment/attachmentfromfolderjob.h - 100% similarity] R  +0    -0   \
messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.cpp [from: \
messagecore/src/attachment/attachmentfrommimecontentjob.cpp - 100% similarity] R  +0  \
-0    messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.h [from: \
messagecore/src/attachment/attachmentfrommimecontentjob.h - 100% similarity] R  +0    \
-0    messagelib/messagecore/src/attachment/attachmentfromurlbasejob.cpp [from: \
messagecore/src/attachment/attachmentfromurlbasejob.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecore/src/attachment/attachmentfromurlbasejob.h [from: \
messagecore/src/attachment/attachmentfromurlbasejob.h - 100% similarity] R  +0    -0  \
messagelib/messagecore/src/attachment/attachmentfromurljob.cpp [from: \
messagecore/src/attachment/attachmentfromurljob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentfromurljob.h [from: \
messagecore/src/attachment/attachmentfromurljob.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentfromurlutils.cpp [from: \
messagecore/src/attachment/attachmentfromurlutils.cpp - 100% similarity] R  +0    -0  \
messagelib/messagecore/src/attachment/attachmentfromurlutils.h [from: \
messagecore/src/attachment/attachmentfromurlutils.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentloadjob.cpp [from: \
messagecore/src/attachment/attachmentloadjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentloadjob.h [from: \
messagecore/src/attachment/attachmentloadjob.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentpart.cpp [from: \
messagecore/src/attachment/attachmentpart.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentpart.h [from: \
messagecore/src/attachment/attachmentpart.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentpropertiesdialog.cpp [from: \
messagecore/src/attachment/attachmentpropertiesdialog.cpp - 100% similarity] R  +0    \
-0    messagelib/messagecore/src/attachment/attachmentpropertiesdialog.h [from: \
messagecore/src/attachment/attachmentpropertiesdialog.h - 100% similarity] R  +0    \
-0    messagelib/messagecore/src/attachment/attachmentupdatejob.cpp [from: \
messagecore/src/attachment/attachmentupdatejob.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/attachmentupdatejob.h [from: \
messagecore/src/attachment/attachmentupdatejob.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog.ui [from: \
messagecore/src/attachment/ui/attachmentpropertiesdialog.ui - 100% similarity] R  +0  \
-0    messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui \
[from: messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui - 100% \
similarity] R  +0    -0    messagelib/messagecore/src/config-enterprise.h.cmake \
[from: messagecore/src/config-enterprise.h.cmake - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/helpers/messagehelpers.cpp [from: \
messagecore/src/helpers/messagehelpers.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/helpers/messagehelpers.h [from: \
messagecore/src/helpers/messagehelpers.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/helpers/nodehelper.cpp [from: \
messagecore/src/helpers/nodehelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/helpers/nodehelper.h [from: \
messagecore/src/helpers/nodehelper.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/messagecoreutil.cpp [from: \
messagecore/src/messagecoreutil.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/messagecoreutil.h [from: messagecore/src/messagecoreutil.h \
- 100% similarity] R  +0    -0    messagelib/messagecore/src/misc/imagecollector.cpp \
[from: messagecore/src/misc/imagecollector.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/misc/imagecollector.h [from: \
messagecore/src/misc/imagecollector.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/misc/mailinglist.cpp [from: \
messagecore/src/misc/mailinglist.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/misc/mailinglist.h [from: \
messagecore/src/misc/mailinglist.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/settings/globalsettings_messagecore.kcfgc [from: \
messagecore/src/settings/globalsettings_messagecore.kcfgc - 100% similarity] R  +0    \
-0    messagelib/messagecore/src/settings/messagecore.kcfg [from: \
messagecore/src/settings/messagecore.kcfg - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/settings/messagecoresettings.cpp [from: \
messagecore/src/settings/messagecoresettings.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/settings/messagecoresettings.h [from: \
messagecore/src/settings/messagecoresettings.h - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/utils/stringutil.cpp [from: \
messagecore/src/utils/stringutil.cpp - 100% similarity] R  +0    -0    \
messagelib/messagecore/src/utils/stringutil.h [from: \
messagecore/src/utils/stringutil.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/.krazy [from: messagelist/.krazy - 100% similarity] R  +1    \
-2    messagelib/messagelist/CMakeLists.txt [from: messagelist/CMakeLists.txt - 096% \
similarity] R  +0    -0    messagelib/messagelist/KF5MessageListConfig.cmake.in \
[from: messagelist/KF5MessageListConfig.cmake.in - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/CMakeLists.txt [from: \
messagelist/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/itemsizetest.cpp [from: \
messagelist/autotests/itemsizetest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/quicksearchlinetest.cpp [from: \
messagelist/autotests/quicksearchlinetest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/quicksearchlinetest.h [from: \
messagelist/autotests/quicksearchlinetest.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/quicksearchwarningtest.cpp [from: \
messagelist/autotests/quicksearchwarningtest.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/autotests/quicksearchwarningtest.h [from: \
messagelist/autotests/quicksearchwarningtest.h - 100% similarity] R  +1    -1    \
messagelib/messagelist/src/CMakeLists.txt [from: messagelist/src/CMakeLists.txt - \
098% similarity] R  +0    -0    messagelib/messagelist/src/Mainpage.dox [from: \
messagelist/src/Mainpage.dox - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/Messages.sh [from: messagelist/src/Messages.sh - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/config-messagelist.h.cmake \
[from: messagelist/src/config-messagelist.h.cmake - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/aggregation.cpp [from: \
messagelist/src/core/aggregation.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/aggregation.h [from: \
messagelist/src/core/aggregation.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/delegate.cpp [from: messagelist/src/core/delegate.cpp \
- 100% similarity] R  +0    -0    messagelib/messagelist/src/core/delegate.h [from: \
messagelist/src/core/delegate.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/enums.h [from: messagelist/src/core/enums.h - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/core/filter.cpp [from: \
messagelist/src/core/filter.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/filter.h [from: messagelist/src/core/filter.h - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/core/groupheaderitem.cpp [from: \
messagelist/src/core/groupheaderitem.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/groupheaderitem.h [from: \
messagelist/src/core/groupheaderitem.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/item.cpp [from: messagelist/src/core/item.cpp - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/core/item.h [from: \
messagelist/src/core/item.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/item_p.h [from: messagelist/src/core/item_p.h - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/core/manager.cpp [from: \
messagelist/src/core/manager.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/manager.h [from: messagelist/src/core/manager.h - \
100% similarity] R  +0    -0    messagelib/messagelist/src/core/messageitem.cpp \
[from: messagelist/src/core/messageitem.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/messageitem.h [from: \
messagelist/src/core/messageitem.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/messageitem_p.h [from: \
messagelist/src/core/messageitem_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/messageitemsetmanager.cpp [from: \
messagelist/src/core/messageitemsetmanager.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/messageitemsetmanager.h [from: \
messagelist/src/core/messageitemsetmanager.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/messagelistsettings.kcfgc [from: \
messagelist/src/core/messagelistsettings.kcfgc - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/model.cpp [from: messagelist/src/core/model.cpp - \
100% similarity] R  +0    -0    messagelib/messagelist/src/core/model.h [from: \
messagelist/src/core/model.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/model_p.h [from: messagelist/src/core/model_p.h - \
100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantindex.cpp [from: \
messagelist/src/core/modelinvariantindex.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantindex.h [from: \
messagelist/src/core/modelinvariantindex.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantindex_p.h [from: \
messagelist/src/core/modelinvariantindex_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantrowmapper.cpp [from: \
messagelist/src/core/modelinvariantrowmapper.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantrowmapper.h [from: \
messagelist/src/core/modelinvariantrowmapper.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/modelinvariantrowmapper_p.h [from: \
messagelist/src/core/modelinvariantrowmapper_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/optionset.cpp [from: \
messagelist/src/core/optionset.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/optionset.h [from: messagelist/src/core/optionset.h - \
100% similarity] R  +0    -0    messagelib/messagelist/src/core/settings.kcfg [from: \
messagelist/src/core/settings.kcfg - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/sortorder.cpp [from: \
messagelist/src/core/sortorder.cpp - 100% similarity] R  +0    -0    \
R  +0    -0    messagelib/messagelist/src/core/storagemodelbase.cpp [from: \
messagelist/src/core/storagemodelbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/storagemodelbase.h [from: \
messagelist/src/core/storagemodelbase.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/theme.cpp [from: messagelist/src/core/theme.cpp - \
100% similarity] R  +0    -0    messagelib/messagelist/src/core/theme.h [from: \
messagelist/src/core/theme.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/themedelegate.cpp [from: \
messagelist/src/core/themedelegate.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/themedelegate.h [from: \
messagelist/src/core/themedelegate.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/view.cpp [from: messagelist/src/core/view.cpp - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/core/view.h [from: \
messagelist/src/core/view.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgetbase.cpp [from: \
messagelist/src/core/widgetbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgetbase.h [from: messagelist/src/core/widgetbase.h \
- 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgets/quicksearchline.cpp [from: \
messagelist/src/core/widgets/quicksearchline.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgets/quicksearchline.h [from: \
messagelist/src/core/widgets/quicksearchline.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgets/quicksearchwarning.cpp [from: \
messagelist/src/core/widgets/quicksearchwarning.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/core/widgets/quicksearchwarning.h [from: \
messagelist/src/core/widgets/quicksearchwarning.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/messagelistutil.cpp [from: \
messagelist/src/messagelistutil.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/messagelistutil.h [from: messagelist/src/messagelistutil.h \
- 100% similarity] R  +0    -0    messagelib/messagelist/src/pane.cpp [from: \
messagelist/src/pane.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/pane.h [from: messagelist/src/pane.h - 100% similarity] R  \
+0    -0    messagelib/messagelist/src/pics/CMakeLists.txt [from: \
messagelist/src/pics/CMakeLists.txt - 100% similarity] R  +-    --    \
messagelib/messagelist/src/pics/mail-deleted.png [from: \
messagelist/src/pics/mail-deleted.png - 100% similarity] R  +-    --    \
messagelib/messagelist/src/pics/mail-horizontal-space.png [from: \
messagelist/src/pics/mail-horizontal-space.png - 100% similarity] R  +-    --    \
messagelib/messagelist/src/pics/mail-thread-ignored.png [from: \
messagelist/src/pics/mail-thread-ignored.png - 100% similarity] R  +-    --    \
messagelib/messagelist/src/pics/mail-thread-watch.png [from: \
messagelist/src/pics/mail-thread-watch.png - 100% similarity] R  +-    --    \
messagelib/messagelist/src/pics/mail-vertical-separator-line.png [from: \
messagelist/src/pics/mail-vertical-separator-line.png - 100% similarity] R  +0    -0  \
messagelib/messagelist/src/storagemodel.cpp [from: messagelist/src/storagemodel.cpp - \
100% similarity] R  +0    -0    messagelib/messagelist/src/storagemodel.h [from: \
messagelist/src/storagemodel.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationcombobox.cpp [from: \
messagelist/src/utils/aggregationcombobox.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationcombobox.h [from: \
messagelist/src/utils/aggregationcombobox.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationcombobox_p.h [from: \
messagelist/src/utils/aggregationcombobox_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationconfigbutton.cpp [from: \
messagelist/src/utils/aggregationconfigbutton.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationconfigbutton.h [from: \
messagelist/src/utils/aggregationconfigbutton.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationeditor.cpp [from: \
messagelist/src/utils/aggregationeditor.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/aggregationeditor.h [from: \
messagelist/src/utils/aggregationeditor.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/comboboxutils.cpp [from: \
messagelist/src/utils/comboboxutils.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/comboboxutils.h [from: \
messagelist/src/utils/comboboxutils.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/configureaggregationsdialog.cpp [from: \
messagelist/src/utils/configureaggregationsdialog.cpp - 100% similarity] R  +0    -0  \
messagelib/messagelist/src/utils/configureaggregationsdialog.h [from: \
messagelist/src/utils/configureaggregationsdialog.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/configureaggregationsdialog_p.h [from: \
messagelist/src/utils/configureaggregationsdialog_p.h - 100% similarity] R  +0    -0  \
messagelib/messagelist/src/utils/configurethemesdialog.cpp [from: \
messagelist/src/utils/configurethemesdialog.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/configurethemesdialog.h [from: \
messagelist/src/utils/configurethemesdialog.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/configurethemesdialog_p.h [from: \
messagelist/src/utils/configurethemesdialog_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/optionseteditor.cpp [from: \
messagelist/src/utils/optionseteditor.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/optionseteditor.h [from: \
messagelist/src/utils/optionseteditor.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themecombobox.cpp [from: \
messagelist/src/utils/themecombobox.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themecombobox.h [from: \
messagelist/src/utils/themecombobox.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themecombobox_p.h [from: \
messagelist/src/utils/themecombobox_p.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themeconfigbutton.cpp [from: \
messagelist/src/utils/themeconfigbutton.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themeconfigbutton.h [from: \
messagelist/src/utils/themeconfigbutton.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themeeditor.cpp [from: \
messagelist/src/utils/themeeditor.cpp - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/utils/themeeditor.h [from: \
messagelist/src/utils/themeeditor.h - 100% similarity] R  +0    -0    \
messagelib/messagelist/src/widget.cpp [from: messagelist/src/widget.cpp - 100% \
similarity] R  +0    -0    messagelib/messagelist/src/widget.h [from: \
messagelist/src/widget.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/.krazy [from: messageviewer/.krazy - 100% similarity] R  +2  \
-2    messagelib/messageviewer/CMakeLists.txt [from: messageviewer/CMakeLists.txt - \
096% similarity] R  +0    -0    \
messagelib/messageviewer/KF5MessageViewerConfig.cmake.in [from: \
messageviewer/KF5MessageViewerConfig.cmake.in - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/CMakeLists.txt [from: \
messageviewer/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/attachmenttest.cpp [from: \
messageviewer/autotests/attachmenttest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/converthtmltoplaintexttest.cpp [from: \
messageviewer/autotests/converthtmltoplaintexttest.cpp - 100% similarity] R  +0    -0 \
messagelib/messageviewer/autotests/converthtmltoplaintexttest.h [from: \
messageviewer/autotests/converthtmltoplaintexttest.h - 100% similarity] R  +0    -0   \
messagelib/messageviewer/autotests/cryptohelpertest.cpp [from: \
messageviewer/autotests/cryptohelpertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/cryptohelpertest.h [from: \
messageviewer/autotests/cryptohelpertest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox [from: \
messageviewer/autotests/data/encapsulated-with-attachment.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox.html \
[from: messageviewer/autotests/data/encapsulated-with-attachment.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox [from: \
messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox - 100% similarity] \
R  +0    -0    messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html \
[from: messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html - 100% \
similarity] R  +0    -0    messagelib/messageviewer/autotests/data/html.mbox [from: \
messageviewer/autotests/data/html.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/html.mbox.html [from: \
messageviewer/autotests/data/html.mbox.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/htmlonly.mbox [from: \
messageviewer/autotests/data/htmlonly.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/htmlonly.mbox.html [from: \
messageviewer/autotests/data/htmlonly.mbox.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox [from: \
messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html \
[from: messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox [from: \
messageviewer/autotests/data/inlinepgpencrypted.mbox - 100% similarity] R  +0    -0   \
messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox.html [from: \
messageviewer/autotests/data/inlinepgpencrypted.mbox.html - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/data/no-content-type.mbox [from: \
messageviewer/autotests/data/no-content-type.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/no-content-type.mbox.html [from: \
messageviewer/autotests/data/no-content-type.mbox.html - 100% similarity] R  +0    -0 \
messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted+signed.mbox - 100% similarity] R  +0   \
-0    messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox \
[from: messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted-attachment.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted-noData.mbox - 100% similarity] R  +0   \
-0    messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox \
[from: messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox \
[from: messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html \
[from: messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox [from: \
messageviewer/autotests/data/openpgp-encrypted.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox.html [from: \
messageviewer/autotests/data/openpgp-encrypted.mbox.html - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox \
[from: messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html \
[from: messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-inline-signed-broken.mbox [from: \
messageviewer/autotests/data/openpgp-inline-signed-broken.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/openpgp-inline-signed.mbox [from: \
R  +0    -0    messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox \
[from: messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox \
[from: messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox [from: \
messageviewer/autotests/data/openpgp-signed-encrypted.mbox - 100% similarity] R  +0   \
-0    messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox \
[from: messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox [from: \
messageviewer/autotests/data/openpgp-signed-mailinglist.mbox - 100% similarity] R  +0 \
-0    messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox [from: \
messageviewer/autotests/data/openpgp-signed-no-protocol.mbox - 100% similarity] R  +0 \
-0    messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox [from: \
messageviewer/autotests/data/openpgp-signed-two-attachments.mbox - 100% similarity] R \
+0    -0    messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html \
[from: messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox \
[from: messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html \
[from: messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox [from: \
messageviewer/autotests/data/smime-encrypted-octet-stream.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html \
[from: messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/smime-encrypted.mbox [from: \
messageviewer/autotests/data/smime-encrypted.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/smime-encrypted.mbox.html [from: \
messageviewer/autotests/data/smime-encrypted.mbox.html - 100% similarity] R  +0    -0 \
messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox [from: \
messageviewer/autotests/data/smime-opaque-enc+sign.mbox - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html [from: \
messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html - 100% similarity] R  +0 \
-0    messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox [from: \
messageviewer/autotests/data/smime-opaque-sign.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox.html [from: \
messageviewer/autotests/data/smime-opaque-sign.mbox.html - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox [from: \
messageviewer/autotests/data/smime-signed-encrypted.mbox - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox.html [from: \
messageviewer/autotests/data/smime-signed-encrypted.mbox.html - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox \
[from: messageviewer/autotests/data/text+html-maillinglist.mbox - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox.html \
[from: messageviewer/autotests/data/text+html-maillinglist.mbox.html - 100% \
similarity] R  +0    -0    messagelib/messageviewer/autotests/data/tnef-one-file.mbox \
[from: messageviewer/autotests/data/tnef-one-file.mbox - 100% similarity] R  +0    -0 \
messagelib/messageviewer/autotests/data/tnef-one-file.mbox.html [from: \
messageviewer/autotests/data/tnef-one-file.mbox.html - 100% similarity] R  +0    -0   \
messagelib/messageviewer/autotests/data/tnef-two-files.mbox [from: \
messageviewer/autotests/data/tnef-two-files.mbox - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/data/tnef-two-files.mbox.html [from: \
messageviewer/autotests/data/tnef-two-files.mbox.html - 100% similarity] R  +0    -0  \
messagelib/messageviewer/autotests/htmlquotecolorertest.cpp [from: \
messageviewer/autotests/htmlquotecolorertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/htmlquotecolorertest.h [from: \
messageviewer/autotests/htmlquotecolorertest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp [from: \
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h \
[from: messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/messagedisplayformatattributetest.cpp [from: \
messageviewer/autotests/messagedisplayformatattributetest.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/autotests/messagedisplayformatattributetest.h \
[from: messageviewer/autotests/messagedisplayformatattributetest.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/autotests/nodehelpertest.cpp [from: \
messageviewer/autotests/nodehelpertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/nodehelpertest.h [from: \
messageviewer/autotests/nodehelpertest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/objecttreeparsertest.cpp [from: \
messageviewer/autotests/objecttreeparsertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/objecttreeparsertest.h [from: \
messageviewer/autotests/objecttreeparsertest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/rendertest.cpp [from: \
messageviewer/autotests/rendertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/setupenv.cpp [from: \
messageviewer/autotests/setupenv.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/setupenv.h [from: \
messageviewer/autotests/setupenv.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/testcsshelper.cpp [from: \
messageviewer/autotests/testcsshelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/testcsshelper.h [from: \
messageviewer/autotests/testcsshelper.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/unencryptedmessagetest.cpp [from: \
messageviewer/autotests/unencryptedmessagetest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/unittestenv/config-sqlite-db.xml [from: \
messageviewer/autotests/unittestenv/config-sqlite-db.xml - 100% similarity] R  +0    \
-0    messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
[from: messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc [from: \
messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc - 100% similarity] \
R  +0    -0    messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc \
[from: messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
[from: messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
- 100% similarity] R  +0    -0    messagelib/messageviewer/autotests/util.cpp [from: \
messageviewer/autotests/util.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/util.h [from: messageviewer/autotests/util.h - \
100% similarity] R  +0    -0    messagelib/messageviewer/autotests/viewertest.cpp \
[from: messageviewer/autotests/viewertest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/viewertest.h [from: \
messageviewer/autotests/viewertest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/zoomactionmenutest.cpp [from: \
messageviewer/autotests/zoomactionmenutest.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/autotests/zoomactionmenutest.h [from: \
messageviewer/autotests/zoomactionmenutest.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/cmake/modules/FindGpgme.cmake [from: \
messageviewer/cmake/modules/FindGpgme.cmake - 100% similarity] R  +0    -0    \
messagelib/messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake [from: \
templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake - 100% similarity] R  \
+0    -0    messagelib/messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
[from: templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake - 100% \
similarity] R  +1    -1    messagelib/messageviewer/src/CMakeLists.txt [from: \
messageviewer/src/CMakeLists.txt - 099% similarity] R  +0    -0    \
messagelib/messageviewer/src/Mainpage.dox [from: messageviewer/src/Mainpage.dox - \
100% similarity] R  +0    -0    messagelib/messageviewer/src/Messages.sh [from: \
messageviewer/src/Messages.sh - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/TODO [from: messageviewer/src/TODO - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/about/CMakeLists.txt [from: \
messageviewer/src/about/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/about/default/CMakeLists.txt [from: \
messageviewer/src/about/default/CMakeLists.txt - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/about/default/background.png [from: \
messageviewer/src/about/default/background.png - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/about/default/main.css [from: \
messageviewer/src/about/default/main.css - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/about/default/main.html [from: \
messageviewer/src/about/default/main.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/about/default/splash.theme [from: \
messageviewer/src/about/default/splash.theme - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/about/default/status.html [from: \
messageviewer/src/about/default/status.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp [from: \
messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.h [from: \
messageviewer/src/adblock/adblockaddsubscriptiondialog.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.cpp [from: \
messageviewer/src/adblock/adblockblockableitemsdialog.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.h [from: \
messageviewer/src/adblock/adblockblockableitemsdialog.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockblockableitemswidget.cpp [from: \
messageviewer/src/adblock/adblockblockableitemswidget.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockblockableitemswidget.h [from: \
messageviewer/src/adblock/adblockblockableitemswidget.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.cpp [from: \
messageviewer/src/adblock/adblockcreatefilterdialog.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.h [from: \
messageviewer/src/adblock/adblockcreatefilterdialog.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/adblock/adblockelementhiding.cpp [from: \
messageviewer/src/adblock/adblockelementhiding.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockelementhiding.h [from: \
messageviewer/src/adblock/adblockelementhiding.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockhostmatcher.cpp [from: \
messageviewer/src/adblock/adblockhostmatcher.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockhostmatcher.h [from: \
messageviewer/src/adblock/adblockhostmatcher.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblocklistwidget.cpp [from: \
messageviewer/src/adblock/adblocklistwidget.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblocklistwidget.h [from: \
messageviewer/src/adblock/adblocklistwidget.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockmanager.cpp [from: \
messageviewer/src/adblock/adblockmanager.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockmanager.h [from: \
messageviewer/src/adblock/adblockmanager.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockrule.cpp [from: \
messageviewer/src/adblock/adblockrule.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockrule.h [from: \
messageviewer/src/adblock/adblockrule.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.cpp [from: \
messageviewer/src/adblock/adblockrulefallbackimpl.cpp - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.h [from: \
messageviewer/src/adblock/adblockrulefallbackimpl.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockruleimpl.h [from: \
messageviewer/src/adblock/adblockruleimpl.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockrulenullimpl.cpp [from: \
R  +0    -0    messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.cpp \
[from: messageviewer/src/adblock/adblockruletextmatchimpl.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.h [from: \
messageviewer/src/adblock/adblockruletextmatchimpl.h - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/adblock/adblocksettingwidget.cpp [from: \
messageviewer/src/adblock/adblocksettingwidget.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblocksettingwidget.h [from: \
messageviewer/src/adblock/adblocksettingwidget.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockshowlistdialog.cpp [from: \
messageviewer/src/adblock/adblockshowlistdialog.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockshowlistdialog.h [from: \
messageviewer/src/adblock/adblockshowlistdialog.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.cpp [from: \
messageviewer/src/adblock/adblocksyntaxhighlighter.cpp - 100% similarity] R  +0    -0 \
messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.h [from: \
messageviewer/src/adblock/adblocksyntaxhighlighter.h - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/adblock/adblockutil.cpp [from: \
messageviewer/src/adblock/adblockutil.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/adblockutil.h [from: \
messageviewer/src/adblock/adblockutil.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/networkaccessmanager.cpp [from: \
messageviewer/src/adblock/networkaccessmanager.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/networkaccessmanager.h [from: \
messageviewer/src/adblock/networkaccessmanager.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/tests/CMakeLists.txt [from: \
messageviewer/src/adblock/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp [from: \
messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h \
[from: messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/tests/adblocksettings_gui.cpp [from: \
messageviewer/src/adblock/tests/adblocksettings_gui.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp [from: \
messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui \
[from: messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui - 100% similarity] R \
+0    -0    messagelib/messageviewer/src/adblock/ui/settings_adblock.ui [from: \
messageviewer/src/adblock/ui/settings_adblock.ui - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/webpage.cpp [from: \
messageviewer/src/adblock/webpage.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/adblock/webpage.h [from: \
messageviewer/src/adblock/webpage.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/antispam/antispamconfig.cpp [from: \
messageviewer/src/antispam/antispamconfig.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/antispam/antispamconfig.h [from: \
messageviewer/src/antispam/antispamconfig.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/antispam/spamheaderanalyzer.cpp [from: \
messageviewer/src/antispam/spamheaderanalyzer.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/antispam/spamheaderanalyzer.h [from: \
messageviewer/src/antispam/spamheaderanalyzer.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/config-messageviewer.h.cmake [from: \
messageviewer/src/config-messageviewer.h.cmake - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/autotests/CMakeLists.txt [from: \
messageviewer/src/findbar/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/autotests/findbarbasetest.cpp [from: \
messageviewer/src/findbar/autotests/findbarbasetest.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/findbar/autotests/findbarbasetest.h [from: \
messageviewer/src/findbar/autotests/findbarbasetest.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/findbar/findbarbase.cpp [from: \
messageviewer/src/findbar/findbarbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/findbarbase.h [from: \
messageviewer/src/findbar/findbarbase.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/findbarmailwebview.cpp [from: \
messageviewer/src/findbar/findbarmailwebview.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/findbarmailwebview.h [from: \
messageviewer/src/findbar/findbarmailwebview.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/findbarsourceview.cpp [from: \
messageviewer/src/findbar/findbarsourceview.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/findbar/findbarsourceview.h [from: \
messageviewer/src/findbar/findbarsourceview.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/grantleefilters/CMakeLists.txt [from: \
messageviewer/src/grantleefilters/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/grantleefilters/messageheaderfilter.cpp [from: \
messageviewer/src/grantleefilters/messageheaderfilter.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/grantleefilters/messageheaderfilter.h [from: \
messageviewer/src/grantleefilters/messageheaderfilter.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp \
[from: messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.h [from: \
messageviewer/src/grantleefilters/messageheadergrantleefilters.h - 100% similarity] R \
+0    -0    messagelib/messageviewer/src/header/CMakeLists.txt [from: \
messageviewer/src/header/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt - 100% similarity] R  +0 \
-0    messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp \
[from: messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h [from: \
messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp \
[from: messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h \
[from: messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp \
[from: messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h \
[from: messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop \
[from: messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/CMakeLists.txt [from: \
messageviewer/src/header/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.cpp [from: \
messageviewer/src/header/autotests/allheaderstyleplugintest.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.h \
[from: messageviewer/src/header/autotests/allheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp [from: \
messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.h \
[from: messageviewer/src/header/autotests/briefheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.cpp [from: \
messageviewer/src/header/autotests/customheaderstyleplugintest.cpp - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.h \
[from: messageviewer/src/header/autotests/customheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp \
[from: messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h \
[from: messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp [from: \
messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.h \
[from: messageviewer/src/header/autotests/fancyheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp \
[from: messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h [from: \
messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp \
[from: messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.h [from: \
messageviewer/src/header/autotests/headerstylepluginmanagertest.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.cpp \
[from: messageviewer/src/header/autotests/longheaderstyleplugintest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.h [from: \
messageviewer/src/header/autotests/longheaderstyleplugintest.h - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp \
[from: messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.h [from: \
messageviewer/src/header/autotests/standardsheaderstyleplugintest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h [from: \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h \
[from: messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop \
[from: messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/contactdisplaymessagememento.cpp [from: \
messageviewer/src/header/contactdisplaymessagememento.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/header/contactdisplaymessagememento.h [from: \
messageviewer/src/header/contactdisplaymessagememento.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt \
[from: messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h - 100% \
similarity] R  +0    -0    \
R  +0    -0    messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h \
[from: messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop \
[from: messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/data/messageviewer_header_themes.knsrc [from: \
messageviewer/src/header/data/messageviewer_header_themes.knsrc - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop \
[from: messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp \
[from: messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h [from: \
messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp \
[from: messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h \
[from: messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp \
[from: messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h \
[from: messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop \
[from: messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderformatter.cpp [from: \
messageviewer/src/header/grantleeheaderformatter.cpp - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/header/grantleeheaderformatter.h [from: \
messageviewer/src/header/grantleeheaderformatter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h \
[from: messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop \
[from: messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/grantleeheaderteststyle.cpp [from: \
messageviewer/src/header/grantleeheaderteststyle.cpp - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/header/grantleeheaderteststyle.h [from: \
messageviewer/src/header/grantleeheaderteststyle.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstrategy.cpp [from: \
messageviewer/src/header/headerstrategy.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstrategy.h [from: \
messageviewer/src/header/headerstrategy.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyle.cpp [from: \
messageviewer/src/header/headerstyle.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyle.h [from: \
messageviewer/src/header/headerstyle.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyle_util.cpp [from: \
messageviewer/src/header/headerstyle_util.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyle_util.h [from: \
messageviewer/src/header/headerstyle_util.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyleinterface.cpp [from: \
messageviewer/src/header/headerstyleinterface.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyleinterface.h [from: \
messageviewer/src/header/headerstyleinterface.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstylemenumanager.cpp [from: \
messageviewer/src/header/headerstylemenumanager.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstylemenumanager.h [from: \
messageviewer/src/header/headerstylemenumanager.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyleplugin.cpp [from: \
messageviewer/src/header/headerstyleplugin.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstyleplugin.h [from: \
messageviewer/src/header/headerstyleplugin.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/headerstylepluginmanager.cpp [from: \
messageviewer/src/header/headerstylepluginmanager.cpp - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/header/headerstylepluginmanager.h [from: \
messageviewer/src/header/headerstylepluginmanager.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/kxface.cpp [from: \
messageviewer/src/header/kxface.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/kxface.h [from: messageviewer/src/header/kxface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp \
[from: messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h \
[from: messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp \
[from: messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h \
[from: messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop \
[from: messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/plainheaderstyle.cpp [from: \
messageviewer/src/header/plainheaderstyle.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/plainheaderstyle.h [from: \
messageviewer/src/header/plainheaderstyle.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/richheaderstrategy.cpp [from: \
messageviewer/src/header/richheaderstrategy.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/richheaderstrategy.h [from: \
messageviewer/src/header/richheaderstrategy.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt [from: \
messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop \
[from: messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h \
[from: messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/tests/CMakeLists.txt [from: \
messageviewer/src/header/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/header/tests/headerstylemenu_gui.cpp [from: \
messageviewer/src/header/tests/headerstylemenu_gui.cpp - 100% similarity] R  +0    -0 \
messagelib/messageviewer/src/header/tests/headerstylemenu_gui.h [from: \
messageviewer/src/header/tests/headerstylemenu_gui.h - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/htmlwriter/filehtmlwriter.cpp [from: \
messageviewer/src/htmlwriter/filehtmlwriter.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/filehtmlwriter.h [from: \
messageviewer/src/htmlwriter/filehtmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.cpp [from: \
messageviewer/src/htmlwriter/queuehtmlwriter.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.h [from: \
messageviewer/src/htmlwriter/queuehtmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/teehtmlwriter.cpp [from: \
messageviewer/src/htmlwriter/teehtmlwriter.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/teehtmlwriter.h [from: \
messageviewer/src/htmlwriter/teehtmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp [from: \
messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.h [from: \
messageviewer/src/htmlwriter/webkitparthtmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/interfaces/bodypart.h [from: \
messageviewer/src/interfaces/bodypart.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/interfaces/bodypartformatter.h [from: \
R  +0    -0    messagelib/messageviewer/src/interfaces/htmlwriter.h [from: \
messageviewer/src/interfaces/htmlwriter.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/interfaces/urlhandler.h [from: \
messageviewer/src/interfaces/urlhandler.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/attachmenteditjob.cpp [from: \
messageviewer/src/job/attachmenteditjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/attachmenteditjob.h [from: \
messageviewer/src/job/attachmenteditjob.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createeventjob.cpp [from: \
messageviewer/src/job/createeventjob.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createeventjob.h [from: \
messageviewer/src/job/createeventjob.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createnotejob.cpp [from: \
messageviewer/src/job/createnotejob.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createnotejob.h [from: \
messageviewer/src/job/createnotejob.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createtodojob.cpp [from: \
messageviewer/src/job/createtodojob.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/createtodojob.h [from: \
messageviewer/src/job/createtodojob.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/kleojobexecutor.cpp [from: \
messageviewer/src/job/kleojobexecutor.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/kleojobexecutor.h [from: \
messageviewer/src/job/kleojobexecutor.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/job/modifymessagedisplayformatjob.cpp [from: \
messageviewer/src/job/modifymessagedisplayformatjob.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/job/modifymessagedisplayformatjob.h [from: \
messageviewer/src/job/modifymessagedisplayformatjob.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/kconf_update/CMakeLists.txt [from: \
messageviewer/src/kconf_update/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/kconf_update/messageviewer.upd [from: \
messageviewer/src/kconf_update/messageviewer.upd - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/notify/messageviewer.notifyrc [from: \
messageviewer/src/notify/messageviewer.notifyrc - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/objecttreesourceif.h [from: \
messageviewer/src/objecttreesourceif.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/pics/CMakeLists.txt [from: \
messageviewer/src/pics/CMakeLists.txt - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_bottom.png [from: \
messageviewer/src/pics/enterprise_bottom.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_bottom_left.png [from: \
messageviewer/src/pics/enterprise_bottom_left.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_bottom_right.png [from: \
messageviewer/src/pics/enterprise_bottom_right.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_icon.png [from: \
messageviewer/src/pics/enterprise_icon.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_left.png [from: \
messageviewer/src/pics/enterprise_left.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_right.png [from: \
messageviewer/src/pics/enterprise_right.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_s_left.png [from: \
messageviewer/src/pics/enterprise_s_left.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_s_right.png [from: \
messageviewer/src/pics/enterprise_s_right.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_sbar.png [from: \
messageviewer/src/pics/enterprise_sbar.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_sp_right.png [from: \
messageviewer/src/pics/enterprise_sp_right.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_sw.png [from: \
messageviewer/src/pics/enterprise_sw.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_top.png [from: \
messageviewer/src/pics/enterprise_top.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_top_left.png [from: \
messageviewer/src/pics/enterprise_top_left.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_top_right.png [from: \
messageviewer/src/pics/enterprise_top_right.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/enterprise_w.png [from: \
messageviewer/src/pics/enterprise_w.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/quicklistClosed.png [from: \
messageviewer/src/pics/quicklistClosed.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/quicklistOpened.png [from: \
messageviewer/src/pics/quicklistOpened.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/quotecollapse.png [from: \
messageviewer/src/pics/quotecollapse.png - 100% similarity] R  +-    --    \
messagelib/messageviewer/src/pics/quoteexpand.png [from: \
messageviewer/src/pics/quoteexpand.png - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/autotests/CMakeLists.txt [from: \
messageviewer/src/scamdetection/autotests/CMakeLists.txt - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.cpp \
[from: messageviewer/src/scamdetection/autotests/scamattributetest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.h [from: \
messageviewer/src/scamdetection/autotests/scamattributetest.h - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.cpp \
[from: messageviewer/src/scamdetection/autotests/test_scamdetection.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.h [from: \
messageviewer/src/scamdetection/autotests/test_scamdetection.h - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/scamdetection/data/longurlServices.json \
[from: messageviewer/src/scamdetection/data/longurlServices.json - 100% similarity] R \
+0    -0    messagelib/messageviewer/src/scamdetection/scamattribute.cpp [from: \
messageviewer/src/scamdetection/scamattribute.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamattribute.h [from: \
messageviewer/src/scamdetection/scamattribute.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamcheckshorturl.cpp [from: \
messageviewer/src/scamdetection/scamcheckshorturl.cpp - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/scamdetection/scamcheckshorturl.h [from: \
messageviewer/src/scamdetection/scamcheckshorturl.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamdetection.cpp [from: \
messageviewer/src/scamdetection/scamdetection.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamdetection.h [from: \
messageviewer/src/scamdetection/scamdetection.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp [from: \
messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.h \
[from: messageviewer/src/scamdetection/scamdetectiondetailsdialog.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp [from: \
messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.h \
[from: messageviewer/src/scamdetection/scamdetectionwarningwidget.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/scamdetection/tests/CMakeLists.txt [from: \
messageviewer/src/scamdetection/tests/CMakeLists.txt - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.cpp [from: \
messageviewer/src/scamdetection/tests/scamdetection_gui.cpp - 100% similarity] R  +0  \
-0    messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.h [from: \
messageviewer/src/scamdetection/tests/scamdetection_gui.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/settings/globalsettings_messageviewer.kcfgc [from: \
messageviewer/src/settings/globalsettings_messageviewer.kcfgc - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/settings/messageviewer.kcfg.cmake [from: \
messageviewer/src/settings/messageviewer.kcfg.cmake - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/settings/messageviewersettings.cpp [from: \
messageviewer/src/settings/messageviewersettings.cpp - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/settings/messageviewersettings.h [from: \
messageviewer/src/settings/messageviewersettings.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/themes/example/header.desktop [from: \
messageviewer/src/themes/example/header.desktop - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/themes/example/header.html [from: \
messageviewer/src/themes/example/header.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/themes/example/header_row.html [from: \
messageviewer/src/themes/example/header_row.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/themes/example_fancy/header.desktop [from: \
messageviewer/src/themes/example_fancy/header.desktop - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/themes/example_fancy/header.html [from: \
messageviewer/src/themes/example_fancy/header.html - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/ui/invitationsettings.ui [from: \
messageviewer/src/ui/invitationsettings.ui - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/ui/printingsettings.ui [from: \
messageviewer/src/ui/printingsettings.ui - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/ui/settings.ui [from: messageviewer/src/ui/settings.ui - \
100% similarity] R  +0    -0    messagelib/messageviewer/src/utils/iconnamecache.cpp \
[from: messageviewer/src/utils/iconnamecache.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/utils/iconnamecache.h [from: \
messageviewer/src/utils/iconnamecache.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/utils/markmessagereadhandler.cpp [from: \
messageviewer/src/utils/markmessagereadhandler.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/utils/markmessagereadhandler.h [from: \
messageviewer/src/utils/markmessagereadhandler.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/utils/messageviewerutil.cpp [from: \
messageviewer/src/utils/messageviewerutil.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/utils/messageviewerutil.h [from: \
messageviewer/src/utils/messageviewerutil.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/attachmentstrategy.cpp [from: \
messageviewer/src/viewer/attachmentstrategy.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/attachmentstrategy.h [from: \
messageviewer/src/viewer/attachmentstrategy.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/bodypartformatter.cpp [from: \
messageviewer/src/viewer/bodypartformatter.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/bodypartformatterfactory.cpp [from: \
messageviewer/src/viewer/bodypartformatterfactory.cpp - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/viewer/bodypartformatterfactory.h [from: \
messageviewer/src/viewer/bodypartformatterfactory.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/bodypartformatterfactory_p.h [from: \
messageviewer/src/viewer/bodypartformatterfactory_p.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/viewer/converthtmltoplaintext.cpp [from: \
messageviewer/src/viewer/converthtmltoplaintext.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/converthtmltoplaintext.h [from: \
messageviewer/src/viewer/converthtmltoplaintext.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/cryptohelper.cpp [from: \
messageviewer/src/viewer/cryptohelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/cryptohelper.h [from: \
messageviewer/src/viewer/cryptohelper.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/csshelper.cpp [from: \
messageviewer/src/viewer/csshelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/csshelper.h [from: \
messageviewer/src/viewer/csshelper.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/csshelperbase.cpp [from: \
messageviewer/src/viewer/csshelperbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/csshelperbase.h [from: \
messageviewer/src/viewer/csshelperbase.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/editorwatcher.cpp [from: \
messageviewer/src/viewer/editorwatcher.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/editorwatcher.h [from: \
messageviewer/src/viewer/editorwatcher.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/htmlquotecolorer.cpp [from: \
messageviewer/src/viewer/htmlquotecolorer.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/htmlquotecolorer.h [from: \
messageviewer/src/viewer/htmlquotecolorer.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/mailwebview.cpp [from: \
messageviewer/src/viewer/mailwebview.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/mailwebview.h [from: \
messageviewer/src/viewer/mailwebview.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.cpp [from: \
messageviewer/src/viewer/memento/cryptobodypartmemento.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.h [from: \
messageviewer/src/viewer/memento/cryptobodypartmemento.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp \
[from: messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.h [from: \
messageviewer/src/viewer/memento/decryptverifybodypartmemento.h - 100% similarity] R  \
R  +0    -0    messagelib/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h \
[from: messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp [from: \
messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp - 100% similarity] R \
+0    -0    messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h \
[from: messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/messagedisplayformatattribute.cpp [from: \
messageviewer/src/viewer/messagedisplayformatattribute.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewer/messagedisplayformatattribute.h [from: \
messageviewer/src/viewer/messagedisplayformatattribute.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewer/messagepart.cpp [from: \
messageviewer/src/viewer/messagepart.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/messagepart.h [from: \
messageviewer/src/viewer/messagepart.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp [from: \
messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.h [from: \
messageviewer/src/viewer/mimeparttree/mimeparttreeview.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp [from: \
messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.h [from: \
messageviewer/src/viewer/mimeparttree/mimetreemodel.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/viewer/nodehelper.cpp [from: \
messageviewer/src/viewer/nodehelper.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/nodehelper.h [from: \
messageviewer/src/viewer/nodehelper.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeemptysource.cpp [from: \
messageviewer/src/viewer/objecttreeemptysource.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeemptysource.h [from: \
messageviewer/src/viewer/objecttreeemptysource.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeparser.cpp [from: \
messageviewer/src/viewer/objecttreeparser.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeparser.h [from: \
messageviewer/src/viewer/objecttreeparser.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeviewersource.cpp [from: \
messageviewer/src/viewer/objecttreeviewersource.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/objecttreeviewersource.h [from: \
messageviewer/src/viewer/objecttreeviewersource.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/partmetadata.h [from: \
messageviewer/src/viewer/partmetadata.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/partnodebodypart.cpp [from: \
messageviewer/src/viewer/partnodebodypart.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/partnodebodypart.h [from: \
messageviewer/src/viewer/partnodebodypart.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/pluginloader.h [from: \
messageviewer/src/viewer/pluginloader.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/pluginloaderbase.cpp [from: \
messageviewer/src/viewer/pluginloaderbase.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/pluginloaderbase.h [from: \
messageviewer/src/viewer/pluginloaderbase.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/stl_util.h [from: \
messageviewer/src/viewer/stl_util.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/urlhandlermanager.cpp [from: \
messageviewer/src/viewer/urlhandlermanager.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/urlhandlermanager.h [from: \
messageviewer/src/viewer/urlhandlermanager.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/viewer.cpp [from: \
messageviewer/src/viewer/viewer.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/viewer.h [from: messageviewer/src/viewer/viewer.h \
- 100% similarity] R  +0    -0    messagelib/messageviewer/src/viewer/viewer_p.cpp \
[from: messageviewer/src/viewer/viewer_p.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewer/viewer_p.h [from: \
messageviewer/src/viewer/viewer_p.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/autotests/CMakeLists.txt - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp \
[from: messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h [from: \
messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.cpp [from: \
messageviewer/src/viewerplugins/autotests/eventedittest.cpp - 100% similarity] R  +0  \
-0    messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.h [from: \
messageviewer/src/viewerplugins/autotests/eventedittest.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.cpp [from: \
messageviewer/src/viewerplugins/autotests/noteedittest.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.h [from: \
messageviewer/src/viewerplugins/autotests/noteedittest.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.cpp [from: \
messageviewer/src/viewerplugins/autotests/todoedittest.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.h [from: \
messageviewer/src/viewerplugins/autotests/todoedittest.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h \
[from: messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h [from: \
messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h \
[from: messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp \
[from: messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h \
[from: messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt - 100% similarity] R \
+0    -0    messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp \
[from: messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h \
[from: messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp [from: \
messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.h \
[from: messageviewer/src/viewerplugins/createeventplugin/eventedit.h - 100% \
similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop \
[from: messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp \
[from: messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h \
[from: messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp \
[from: messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h \
[from: messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop \
[from: messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp [from: \
messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.h \
[from: messageviewer/src/viewerplugins/createnoteplugin/noteedit.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp \
[from: messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h \
[from: messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp \
[from: messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h \
[from: messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop \
[from: messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp [from: \
messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h \
[from: messageviewer/src/viewerplugins/createtodoplugin/todoedit.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp \
[from: messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h \
[from: messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp \
[from: messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h \
[from: messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/tests/CMakeLists.txt [from: \
messageviewer/src/viewerplugins/tests/CMakeLists.txt - 100% similarity] R  +0    -0   \
messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp [from: \
messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp - 100% similarity] R  +0   \
-0    messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h [from: \
messageviewer/src/viewerplugins/tests/viewerplugin_gui.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt \
[from: messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt - 100% \
similarity] R  +0    -0    \
R  +0    -0    messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp \
[from: messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h \
[from: messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h - \
100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp \
[from: messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h \
[from: messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h \
- 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/viewerplugin.cpp [from: \
messageviewer/src/viewerplugins/viewerplugin.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/viewerplugin.h [from: \
messageviewer/src/viewerplugins/viewerplugin.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/viewerplugins/viewerplugininterface.cpp [from: \
messageviewer/src/viewerplugins/viewerplugininterface.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/viewerplugininterface.h [from: \
messageviewer/src/viewerplugins/viewerplugininterface.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.cpp [from: \
messageviewer/src/viewerplugins/viewerpluginmanager.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.h [from: \
messageviewer/src/viewerplugins/viewerpluginmanager.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp [from: \
messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp - 100% similarity] R  +0  \
-0    messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.h [from: \
messageviewer/src/viewerplugins/viewerplugintoolmanager.h - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/widgets/attachmentdialog.cpp [from: \
messageviewer/src/widgets/attachmentdialog.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/attachmentdialog.h [from: \
messageviewer/src/widgets/attachmentdialog.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/configurewidget.cpp [from: \
messageviewer/src/widgets/configurewidget.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/configurewidget.h [from: \
messageviewer/src/widgets/configurewidget.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/customheadersettingdialog.cpp [from: \
messageviewer/src/widgets/customheadersettingdialog.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/widgets/customheadersettingdialog.h [from: \
messageviewer/src/widgets/customheadersettingdialog.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/widgets/customheadersettingwidget.cpp [from: \
messageviewer/src/widgets/customheadersettingwidget.cpp - 100% similarity] R  +0    \
-0    messagelib/messageviewer/src/widgets/customheadersettingwidget.h [from: \
messageviewer/src/widgets/customheadersettingwidget.h - 100% similarity] R  +0    -0  \
messagelib/messageviewer/src/widgets/htmlstatusbar.cpp [from: \
messageviewer/src/widgets/htmlstatusbar.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/htmlstatusbar.h [from: \
messageviewer/src/widgets/htmlstatusbar.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/invitationsettings.cpp [from: \
messageviewer/src/widgets/invitationsettings.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/invitationsettings.h [from: \
messageviewer/src/widgets/invitationsettings.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/mailsourceviewer.cpp [from: \
messageviewer/src/widgets/mailsourceviewer.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/mailsourceviewer.h [from: \
messageviewer/src/widgets/mailsourceviewer.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp [from: \
messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h \
[from: messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h - 100% similarity] \
R  +0    -0    messagelib/messageviewer/src/widgets/openattachmentfolderwidget.cpp \
[from: messageviewer/src/widgets/openattachmentfolderwidget.cpp - 100% similarity] R  \
+0    -0    messagelib/messageviewer/src/widgets/openattachmentfolderwidget.h [from: \
messageviewer/src/widgets/openattachmentfolderwidget.h - 100% similarity] R  +0    -0 \
messagelib/messageviewer/src/widgets/printingsettings.cpp [from: \
messageviewer/src/widgets/printingsettings.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/printingsettings.h [from: \
messageviewer/src/widgets/printingsettings.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/vcardviewer.cpp [from: \
messageviewer/src/widgets/vcardviewer.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/vcardviewer.h [from: \
messageviewer/src/widgets/vcardviewer.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/zoomactionmenu.cpp [from: \
messageviewer/src/widgets/zoomactionmenu.cpp - 100% similarity] R  +0    -0    \
messagelib/messageviewer/src/widgets/zoomactionmenu.h [from: \
messageviewer/src/widgets/zoomactionmenu.h - 100% similarity] R  +0    -0    \
messagelib/messageviewer/tests/CMakeLists.txt [from: \
messageviewer/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/messageviewer/tests/viewertest_gui.cpp [from: \
messageviewer/tests/viewertest_gui.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/.krazy [from: templateparser/.krazy - 100% similarity] R  \
+2    -3    messagelib/templateparser/CMakeLists.txt [from: \
templateparser/CMakeLists.txt - 094% similarity] R  +0    -0    \
messagelib/templateparser/KF5TemplateParserConfig.cmake.in [from: \
templateparser/KF5TemplateParserConfig.cmake.in - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/CMakeLists.txt [from: \
templateparser/autotests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/customtemplatesmenutest.cpp [from: \
templateparser/autotests/customtemplatesmenutest.cpp - 100% similarity] R  +0    -0   \
messagelib/templateparser/autotests/customtemplatesmenutest.h [from: \
templateparser/autotests/customtemplatesmenutest.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/data/insert-file.txt [from: \
templateparser/autotests/data/insert-file.txt - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/data/plain-message.mbox [from: \
templateparser/autotests/data/plain-message.mbox - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/data/plain-message.mbox.html [from: \
templateparser/autotests/data/plain-message.mbox.html - 100% similarity] R  +0    -0  \
messagelib/templateparser/autotests/templateparsertest.cpp [from: \
templateparser/autotests/templateparsertest.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/autotests/templateparsertest.h [from: \
templateparser/autotests/templateparsertest.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake [from: \
messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake - 100% similarity] R  \
+0    -0    messagelib/templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
[from: messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake - 100% \
similarity] R  +1    -1    messagelib/templateparser/src/CMakeLists.txt [from: \
templateparser/src/CMakeLists.txt - 098% similarity] R  +0    -0    \
messagelib/templateparser/src/Messages.sh [from: templateparser/src/Messages.sh - \
100% similarity] R  +0    -0    messagelib/templateparser/src/customtemplates.cpp \
[from: templateparser/src/customtemplates.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/customtemplates.h [from: \
templateparser/src/customtemplates.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/customtemplatesmenu.cpp [from: \
templateparser/src/customtemplatesmenu.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/customtemplatesmenu.h [from: \
templateparser/src/customtemplatesmenu.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/defaulttemplates.cpp [from: \
templateparser/src/defaulttemplates.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/defaulttemplates.h [from: \
templateparser/src/defaulttemplates.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/settings/customtemplates_kfg.kcfg [from: \
templateparser/src/settings/customtemplates_kfg.kcfg - 100% similarity] R  +0    -0   \
messagelib/templateparser/src/settings/customtemplates_kfg.kcfgc [from: \
templateparser/src/settings/customtemplates_kfg.kcfgc - 100% similarity] R  +0    -0  \
messagelib/templateparser/src/settings/globalsettings_templateparser.kcfgc [from: \
templateparser/src/settings/globalsettings_templateparser.kcfgc - 100% similarity] R  \
+0    -0    messagelib/templateparser/src/settings/templateparser.kcfg [from: \
templateparser/src/settings/templateparser.kcfg - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfg [from: \
templateparser/src/settings/templatesconfiguration_kfg.kcfg - 100% similarity] R  +0  \
-0    messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfgc [from: \
templateparser/src/settings/templatesconfiguration_kfg.kcfgc - 100% similarity] R  +0 \
-0    messagelib/templateparser/src/templateparser.cpp [from: \
templateparser/src/templateparser.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templateparser.h [from: \
templateparser/src/templateparser.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesconfiguration.cpp [from: \
templateparser/src/templatesconfiguration.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesconfiguration.h [from: \
templateparser/src/templatesconfiguration.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesinsertcommand.cpp [from: \
templateparser/src/templatesinsertcommand.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesinsertcommand.h [from: \
templateparser/src/templatesinsertcommand.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatessyntaxhighlighterrules.cpp [from: \
templateparser/src/templatessyntaxhighlighterrules.cpp - 100% similarity] R  +0    -0 \
messagelib/templateparser/src/templatessyntaxhighlighterrules.h [from: \
templateparser/src/templatessyntaxhighlighterrules.h - 100% similarity] R  +0    -0   \
messagelib/templateparser/src/templatestextedit.cpp [from: \
templateparser/src/templatestextedit.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatestextedit.h [from: \
templateparser/src/templatestextedit.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatestexteditor.cpp [from: \
templateparser/src/templatestexteditor.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatestexteditor.h [from: \
templateparser/src/templatestexteditor.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesutil.cpp [from: \
templateparser/src/templatesutil.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/templatesutil.h [from: \
templateparser/src/templatesutil.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/ui/customtemplates_base.ui [from: \
templateparser/src/ui/customtemplates_base.ui - 100% similarity] R  +0    -0    \
messagelib/templateparser/src/ui/templatesconfiguration_base.ui [from: \
templateparser/src/ui/templatesconfiguration_base.ui - 100% similarity] R  +0    -0   \
messagelib/templateparser/tests/CMakeLists.txt [from: \
templateparser/tests/CMakeLists.txt - 100% similarity] R  +0    -0    \
messagelib/templateparser/tests/templateconfigurewidget_gui.cpp [from: \
templateparser/tests/templateconfigurewidget_gui.cpp - 100% similarity] R  +0    -0   \
messagelib/templateparser/tests/templateconfigurewidget_gui.h [from: \
templateparser/tests/templateconfigurewidget_gui.h - 100% similarity] R  +0    -0    \
messagelib/templateparser/tests/templateeditor_gui.cpp [from: \
templateparser/tests/templateeditor_gui.cpp - 100% similarity] R  +0    -0    \
messagelib/templateparser/tests/templateeditor_gui.h [from: \
templateparser/tests/templateeditor_gui.h - 100% similarity]

http://commits.kde.org/kdepim/7c4171fc24714a651d64282f0fb6e6356a50f4f4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe995f..4553d69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,28 +16,21 @@ if (KDEPIM_SUPERBUILD)
 include(SuperBuild.cmake)
 
 set(LIBRARY_NAMELINK)
-sb_add_project(libfollowupreminder)
-sb_add_project(libsendlater)
 sb_add_project(grantleetheme)
 sb_add_project(libkdepim)
-sb_add_project(libkdepimdbusinterfaces)
 sb_add_project(kdgantt2)
 sb_add_project(mailimporter)
 sb_add_project(pimcommon)
+sb_add_project(kdepim-apps-lib)
 sb_add_project(libgravatar)
-sb_add_project(composereditor-ng)
 sb_add_project(libkleo)
-sb_add_project(kaddressbookgrantlee)
 sb_add_project(calendarsupport)
 sb_add_project(eventviews)
 sb_add_project(incidenceeditor-ng)
 sb_add_project(libksieve)
-sb_add_project(messagecore)
-sb_add_project(messagelist)
-sb_add_project(messageviewer)
-sb_add_project(templateparser)
-sb_add_project(messagecomposer)
+sb_add_project(messagelib)
 sb_add_project(mailcommon)
+
 sb_end()
 
 else()
@@ -271,26 +264,18 @@ endif()
 # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
 configure_file(config-enterprise.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )  if (NOT \
                KDEPIM_BUILD_WITH_INSTALLED_LIB)
-add_subdirectory(libfollowupreminder)
-add_subdirectory(libsendlater)
+add_subdirectory(kdepim-apps-lib)
 add_subdirectory(libgravatar)
 add_subdirectory(libkdepim)
 add_subdirectory(calendarsupport)
 add_subdirectory(eventviews)
 add_subdirectory(incidenceeditor-ng)
-add_subdirectory(libkdepimdbusinterfaces)
 add_subdirectory(libkleo)
 add_subdirectory(libksieve)
 add_subdirectory(kdgantt2)
-add_subdirectory(kaddressbookgrantlee)
-add_subdirectory(composereditor-ng)
-add_subdirectory(messagecore)
 add_subdirectory(grantleetheme)
-add_subdirectory(messagelist)
-add_subdirectory(templateparser)
+add_subdirectory(messagelib)
 add_subdirectory(mailimporter)
-add_subdirectory(messageviewer)
-add_subdirectory(messagecomposer)
 add_subdirectory(pimcommon)
 add_subdirectory(mailcommon)
 
diff --git a/kdepim-apps-lib/CMakeLists.txt b/kdepim-apps-lib/CMakeLists.txt
new file mode 100644
index 0000000..ceaf799
--- /dev/null
+++ b/kdepim-apps-lib/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(kdepim-apps-lib)
+cmake_minimum_required(VERSION 2.8.12)
+
+
+
+add_subdirectory(composereditor-ng)
+add_subdirectory(libfollowupreminder)
+add_subdirectory(libkdepimdbusinterfaces)
+add_subdirectory(libsendlater)
+add_subdirectory(kaddressbookgrantlee)
diff --git a/composereditor-ng/CMakeLists.txt \
b/kdepim-apps-lib/composereditor-ng/CMakeLists.txt similarity index 97%
rename from composereditor-ng/CMakeLists.txt
rename to kdepim-apps-lib/composereditor-ng/CMakeLists.txt
index e27d929..707f6d0 100644
--- a/composereditor-ng/CMakeLists.txt
+++ b/kdepim-apps-lib/composereditor-ng/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(composereditorng)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${composereditorng_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in \
b/kdepim-apps-lib/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in similarity \
index 100% rename from composereditor-ng/KF5ComposerEditorNGConfig.cmake.in
rename to kdepim-apps-lib/composereditor-ng/KF5ComposerEditorNGConfig.cmake.in
diff --git a/composereditor-ng/TODO b/kdepim-apps-lib/composereditor-ng/TODO
similarity index 100%
rename from composereditor-ng/TODO
rename to kdepim-apps-lib/composereditor-ng/TODO
diff --git a/composereditor-ng/src/CMakeLists.txt \
b/kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt similarity index 98%
rename from composereditor-ng/src/CMakeLists.txt
rename to kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt
index 13e08b5..62c6e81 100644
--- a/composereditor-ng/src/CMakeLists.txt
+++ b/kdepim-apps-lib/composereditor-ng/src/CMakeLists.txt
@@ -84,7 +84,7 @@ ecm_generate_pri_file(BASE_NAME ComposerEditorNG
     DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR \
${KDE_INSTALL_INCLUDEDIR_KF5}/ComposerEditorNG  )
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${composereditorng_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 install(FILES
     ${composereditorng_CamelCase_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/ComposerEditorNG
diff --git a/composereditor-ng/src/Messages.sh \
b/kdepim-apps-lib/composereditor-ng/src/Messages.sh similarity index 100%
rename from composereditor-ng/src/Messages.sh
rename to kdepim-apps-lib/composereditor-ng/src/Messages.sh
diff --git a/composereditor-ng/src/composereditor-ng.kcfg \
b/kdepim-apps-lib/composereditor-ng/src/composereditor-ng.kcfg similarity index 100%
rename from composereditor-ng/src/composereditor-ng.kcfg
rename to kdepim-apps-lib/composereditor-ng/src/composereditor-ng.kcfg
diff --git a/composereditor-ng/src/composereditor.cpp \
b/kdepim-apps-lib/composereditor-ng/src/composereditor.cpp similarity index 100%
rename from composereditor-ng/src/composereditor.cpp
rename to kdepim-apps-lib/composereditor-ng/src/composereditor.cpp
diff --git a/composereditor-ng/src/composereditor.h \
b/kdepim-apps-lib/composereditor-ng/src/composereditor.h similarity index 100%
rename from composereditor-ng/src/composereditor.h
rename to kdepim-apps-lib/composereditor-ng/src/composereditor.h
diff --git a/composereditor-ng/src/composerview.cpp \
b/kdepim-apps-lib/composereditor-ng/src/composerview.cpp similarity index 100%
rename from composereditor-ng/src/composerview.cpp
rename to kdepim-apps-lib/composereditor-ng/src/composerview.cpp
diff --git a/composereditor-ng/src/composerview.h \
b/kdepim-apps-lib/composereditor-ng/src/composerview.h similarity index 100%
rename from composereditor-ng/src/composerview.h
rename to kdepim-apps-lib/composereditor-ng/src/composerview.h
diff --git a/composereditor-ng/src/data/composereditorinitialhtml \
b/kdepim-apps-lib/composereditor-ng/src/data/composereditorinitialhtml similarity \
index 100% rename from composereditor-ng/src/data/composereditorinitialhtml
rename to kdepim-apps-lib/composereditor-ng/src/data/composereditorinitialhtml
diff --git a/composereditor-ng/src/extendattributes/extendattributesbutton.cpp \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.cpp \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesbutton.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.cpp
                
diff --git a/composereditor-ng/src/extendattributes/extendattributesbutton.h \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.h \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesbutton.h rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesbutton.h
                
diff --git a/composereditor-ng/src/extendattributes/extendattributesdialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.cpp \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesdialog.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.cpp
                
diff --git a/composereditor-ng/src/extendattributes/extendattributesdialog.h \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.h \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesdialog.h rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesdialog.h
                
diff --git a/composereditor-ng/src/extendattributes/extendattributesutils.cpp \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils.cpp \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesutils.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils.cpp
                
diff --git a/composereditor-ng/src/extendattributes/extendattributesutils_p.h \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils_p.h \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributesutils_p.h rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributesutils_p.h
                
diff --git a/composereditor-ng/src/extendattributes/extendattributeswidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.cpp \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributeswidget.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.cpp
                
diff --git a/composereditor-ng/src/extendattributes/extendattributeswidget.h \
b/kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.h \
similarity index 100% rename from \
composereditor-ng/src/extendattributes/extendattributeswidget.h rename to \
                kdepim-apps-lib/composereditor-ng/src/extendattributes/extendattributeswidget.h
                
diff --git a/composereditor-ng/src/globalsetting_composereditorng.kcfgc \
b/kdepim-apps-lib/composereditor-ng/src/globalsetting_composereditorng.kcfgc \
similarity index 100% rename from \
composereditor-ng/src/globalsetting_composereditorng.kcfgc rename to \
                kdepim-apps-lib/composereditor-ng/src/globalsetting_composereditorng.kcfgc
                
diff --git a/composereditor-ng/src/helper/listhelper.cpp \
b/kdepim-apps-lib/composereditor-ng/src/helper/listhelper.cpp similarity index 100%
rename from composereditor-ng/src/helper/listhelper.cpp
rename to kdepim-apps-lib/composereditor-ng/src/helper/listhelper.cpp
diff --git a/composereditor-ng/src/helper/listhelper_p.h \
b/kdepim-apps-lib/composereditor-ng/src/helper/listhelper_p.h similarity index 100%
rename from composereditor-ng/src/helper/listhelper_p.h
rename to kdepim-apps-lib/composereditor-ng/src/helper/listhelper_p.h
diff --git a/composereditor-ng/src/helper/tablehelper.cpp \
b/kdepim-apps-lib/composereditor-ng/src/helper/tablehelper.cpp similarity index 100%
rename from composereditor-ng/src/helper/tablehelper.cpp
rename to kdepim-apps-lib/composereditor-ng/src/helper/tablehelper.cpp
diff --git a/composereditor-ng/src/helper/tablehelper_p.h \
b/kdepim-apps-lib/composereditor-ng/src/helper/tablehelper_p.h similarity index 100%
rename from composereditor-ng/src/helper/tablehelper_p.h
rename to kdepim-apps-lib/composereditor-ng/src/helper/tablehelper_p.h
diff --git a/composereditor-ng/src/image/composerimagedialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.cpp similarity \
index 100% rename from composereditor-ng/src/image/composerimagedialog.cpp
rename to kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.cpp
diff --git a/composereditor-ng/src/image/composerimagedialog.h \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.h similarity index \
100% rename from composereditor-ng/src/image/composerimagedialog.h
rename to kdepim-apps-lib/composereditor-ng/src/image/composerimagedialog.h
diff --git a/composereditor-ng/src/image/composerimageresizetooltip.cpp \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.cpp \
similarity index 100% rename from \
composereditor-ng/src/image/composerimageresizetooltip.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.cpp
                
diff --git a/composereditor-ng/src/image/composerimageresizetooltip.h \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.h similarity \
index 100% rename from composereditor-ng/src/image/composerimageresizetooltip.h
rename to kdepim-apps-lib/composereditor-ng/src/image/composerimageresizetooltip.h
diff --git a/composereditor-ng/src/image/composerimageresizewidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.cpp \
similarity index 100% rename from \
composereditor-ng/src/image/composerimageresizewidget.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.cpp
                
diff --git a/composereditor-ng/src/image/composerimageresizewidget.h \
b/kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.h similarity \
index 100% rename from composereditor-ng/src/image/composerimageresizewidget.h
rename to kdepim-apps-lib/composereditor-ng/src/image/composerimageresizewidget.h
diff --git a/composereditor-ng/src/link/composeranchordialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.cpp similarity \
index 100% rename from composereditor-ng/src/link/composeranchordialog.cpp
rename to kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.cpp
diff --git a/composereditor-ng/src/link/composeranchordialog.h \
b/kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.h similarity index \
100% rename from composereditor-ng/src/link/composeranchordialog.h
rename to kdepim-apps-lib/composereditor-ng/src/link/composeranchordialog.h
diff --git a/composereditor-ng/src/link/composerlinkdialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.cpp similarity index \
100% rename from composereditor-ng/src/link/composerlinkdialog.cpp
rename to kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.cpp
diff --git a/composereditor-ng/src/link/composerlinkdialog.h \
b/kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.h similarity index \
100% rename from composereditor-ng/src/link/composerlinkdialog.h
rename to kdepim-apps-lib/composereditor-ng/src/link/composerlinkdialog.h
diff --git a/composereditor-ng/src/list/composerlistdialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.cpp similarity index \
100% rename from composereditor-ng/src/list/composerlistdialog.cpp
rename to kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.cpp
diff --git a/composereditor-ng/src/list/composerlistdialog.h \
b/kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.h similarity index \
100% rename from composereditor-ng/src/list/composerlistdialog.h
rename to kdepim-apps-lib/composereditor-ng/src/list/composerlistdialog.h
diff --git a/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp \
similarity index 100% rename from \
composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.cpp
                
diff --git a/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h \
b/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h \
similarity index 100% rename from \
composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h rename to \
                kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgrounddialog.h
                
diff --git a/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp \
similarity index 100% rename from \
composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.cpp
                
diff --git a/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h \
b/kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h \
similarity index 100% rename from \
composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h rename to \
                kdepim-apps-lib/composereditor-ng/src/pagecolor/pagecolorbackgroundwidget.h
                
diff --git a/composereditor-ng/src/private/composerview_p.cpp \
b/kdepim-apps-lib/composereditor-ng/src/private/composerview_p.cpp similarity index \
100% rename from composereditor-ng/src/private/composerview_p.cpp
rename to kdepim-apps-lib/composereditor-ng/src/private/composerview_p.cpp
diff --git a/composereditor-ng/src/private/composerview_p.h \
b/kdepim-apps-lib/composereditor-ng/src/private/composerview_p.h similarity index \
100% rename from composereditor-ng/src/private/composerview_p.h
rename to kdepim-apps-lib/composereditor-ng/src/private/composerview_p.h
diff --git a/composereditor-ng/src/table/composercellsizewidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.cpp similarity \
index 100% rename from composereditor-ng/src/table/composercellsizewidget.cpp
rename to kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.cpp
diff --git a/composereditor-ng/src/table/composercellsizewidget.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.h similarity \
index 100% rename from composereditor-ng/src/table/composercellsizewidget.h
rename to kdepim-apps-lib/composereditor-ng/src/table/composercellsizewidget.h
diff --git a/composereditor-ng/src/table/composertableactionmenu.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.cpp similarity \
index 100% rename from composereditor-ng/src/table/composertableactionmenu.cpp
rename to kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.cpp
diff --git a/composereditor-ng/src/table/composertableactionmenu.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.h similarity \
index 100% rename from composereditor-ng/src/table/composertableactionmenu.h
rename to kdepim-apps-lib/composereditor-ng/src/table/composertableactionmenu.h
diff --git a/composereditor-ng/src/table/composertablecellformatdialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.cpp \
similarity index 100% rename from \
composereditor-ng/src/table/composertablecellformatdialog.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.cpp
                
diff --git a/composereditor-ng/src/table/composertablecellformatdialog.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.h \
similarity index 100% rename from \
composereditor-ng/src/table/composertablecellformatdialog.h rename to \
                kdepim-apps-lib/composereditor-ng/src/table/composertablecellformatdialog.h
                
diff --git a/composereditor-ng/src/table/composertabledialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.cpp similarity \
index 100% rename from composereditor-ng/src/table/composertabledialog.cpp
rename to kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.cpp
diff --git a/composereditor-ng/src/table/composertabledialog.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.h similarity index \
100% rename from composereditor-ng/src/table/composertabledialog.h
rename to kdepim-apps-lib/composereditor-ng/src/table/composertabledialog.h
diff --git a/composereditor-ng/src/table/composertableformatdialog.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.cpp \
similarity index 100% rename from \
composereditor-ng/src/table/composertableformatdialog.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.cpp
                
diff --git a/composereditor-ng/src/table/composertableformatdialog.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.h similarity \
index 100% rename from composereditor-ng/src/table/composertableformatdialog.h
rename to kdepim-apps-lib/composereditor-ng/src/table/composertableformatdialog.h
diff --git a/composereditor-ng/src/table/composertableresizewidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.cpp \
similarity index 100% rename from \
composereditor-ng/src/table/composertableresizewidget.cpp rename to \
                kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.cpp
                
diff --git a/composereditor-ng/src/table/composertableresizewidget.h \
b/kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.h similarity \
index 100% rename from composereditor-ng/src/table/composertableresizewidget.h
rename to kdepim-apps-lib/composereditor-ng/src/table/composertableresizewidget.h
diff --git a/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui \
b/kdepim-apps-lib/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui similarity \
index 100% rename from composereditor-ng/src/ui/pagecolorbackgroundwidget.ui
rename to kdepim-apps-lib/composereditor-ng/src/ui/pagecolorbackgroundwidget.ui
diff --git a/composereditor-ng/src/utils/composereditorutils.cpp \
b/kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils.cpp similarity \
index 100% rename from composereditor-ng/src/utils/composereditorutils.cpp
rename to kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils.cpp
diff --git a/composereditor-ng/src/utils/composereditorutils_p.h \
b/kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils_p.h similarity \
index 100% rename from composereditor-ng/src/utils/composereditorutils_p.h
rename to kdepim-apps-lib/composereditor-ng/src/utils/composereditorutils_p.h
diff --git a/composereditor-ng/src/widgets/domtreewidget.cpp \
b/kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.cpp similarity index \
100% rename from composereditor-ng/src/widgets/domtreewidget.cpp
rename to kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.cpp
diff --git a/composereditor-ng/src/widgets/domtreewidget.h \
b/kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.h similarity index 100%
rename from composereditor-ng/src/widgets/domtreewidget.h
rename to kdepim-apps-lib/composereditor-ng/src/widgets/domtreewidget.h
diff --git a/composereditor-ng/src/widgets/findreplacebar.cpp \
b/kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.cpp similarity index \
100% rename from composereditor-ng/src/widgets/findreplacebar.cpp
rename to kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.cpp
diff --git a/composereditor-ng/src/widgets/findreplacebar.h \
b/kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.h similarity index \
100% rename from composereditor-ng/src/widgets/findreplacebar.h
rename to kdepim-apps-lib/composereditor-ng/src/widgets/findreplacebar.h
diff --git a/composereditor-ng/tests/CMakeLists.txt \
b/kdepim-apps-lib/composereditor-ng/tests/CMakeLists.txt similarity index 100%
rename from composereditor-ng/tests/CMakeLists.txt
rename to kdepim-apps-lib/composereditor-ng/tests/CMakeLists.txt
diff --git a/composereditor-ng/tests/composerhtmleditor.cpp \
b/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.cpp similarity index \
100% rename from composereditor-ng/tests/composerhtmleditor.cpp
rename to kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.cpp
diff --git a/composereditor-ng/tests/composerhtmleditor.h \
b/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.h similarity index 100%
rename from composereditor-ng/tests/composerhtmleditor.h
rename to kdepim-apps-lib/composereditor-ng/tests/composerhtmleditor.h
diff --git a/composereditor-ng/tests/composerhtmleditorui.rc \
b/kdepim-apps-lib/composereditor-ng/tests/composerhtmleditorui.rc similarity index \
100% rename from composereditor-ng/tests/composerhtmleditorui.rc
rename to kdepim-apps-lib/composereditor-ng/tests/composerhtmleditorui.rc
diff --git a/composereditor-ng/tests/main.cpp \
b/kdepim-apps-lib/composereditor-ng/tests/main.cpp similarity index 100%
rename from composereditor-ng/tests/main.cpp
rename to kdepim-apps-lib/composereditor-ng/tests/main.cpp
diff --git a/kaddressbookgrantlee/CMakeLists.txt \
b/kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt similarity index 97%
rename from kaddressbookgrantlee/CMakeLists.txt
rename to kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt
index e08e8cb..381f623 100644
--- a/kaddressbookgrantlee/CMakeLists.txt
+++ b/kdepim-apps-lib/kaddressbookgrantlee/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(kaddressbookgrantlee)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${kaddressbookgrantlee_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in \
b/kdepim-apps-lib/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in \
similarity index 100% rename from \
kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in rename to \
                kdepim-apps-lib/kaddressbookgrantlee/KF5KaddressbookGrantleeConfig.cmake.in
                
diff --git a/kaddressbookgrantlee/src/CMakeLists.txt \
b/kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt similarity index 98%
rename from kaddressbookgrantlee/src/CMakeLists.txt
rename to kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt
index f4866da..a582238 100644
--- a/kaddressbookgrantlee/src/CMakeLists.txt
+++ b/kdepim-apps-lib/kaddressbookgrantlee/src/CMakeLists.txt
@@ -93,7 +93,7 @@ ecm_generate_pri_file(BASE_NAME KaddressbookGrantlee
 )
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${kaddressbookgrantlee_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 install(FILES
     ${KaddressbookGrantlee_CamelCasewidgets_HEADERS}
     ${KaddressbookGrantlee_CamelCaseformatter_HEADERS}
diff --git a/kaddressbookgrantlee/src/Messages.sh \
b/kdepim-apps-lib/kaddressbookgrantlee/src/Messages.sh similarity index 100%
rename from kaddressbookgrantlee/src/Messages.sh
rename to kdepim-apps-lib/kaddressbookgrantlee/src/Messages.sh
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
                
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/formatter/grantleecontactformatter.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h
                
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
 similarity index 100%
rename from kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
rename to kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
                
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h
                
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.cpp
                
diff --git a/kaddressbookgrantlee/src/formatter/grantleecontactutils.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/formatter/grantleecontactutils.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/formatter/grantleecontactutils.h
                
diff --git a/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/CMakeLists.txt
                
diff --git a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
 similarity index 100%
rename from kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
 similarity index 100%
rename from kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintaddressobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
 similarity index 100%
rename from kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
 similarity index 100%
rename from kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintcryptoobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintgeoobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintimobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
 similarity index 100%
rename from kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.cpp
                
diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h \
similarity index 100% rename from \
kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/printing/contactgrantleeprintphoneobject.h
                
diff --git a/kaddressbookgrantlee/src/printing/grantleeprint.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.cpp similarity \
index 100% rename from kaddressbookgrantlee/src/printing/grantleeprint.cpp
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.cpp
diff --git a/kaddressbookgrantlee/src/printing/grantleeprint.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.h similarity index \
100% rename from kaddressbookgrantlee/src/printing/grantleeprint.h
rename to kdepim-apps-lib/kaddressbookgrantlee/src/printing/grantleeprint.h
diff --git a/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp \
b/kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp \
similarity index 100% rename from \
kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp rename to \
                kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.cpp
                
diff --git a/kaddressbookgrantlee/src/widget/grantleecontactviewer.h \
b/kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.h similarity \
index 100% rename from kaddressbookgrantlee/src/widget/grantleecontactviewer.h
rename to kdepim-apps-lib/kaddressbookgrantlee/src/widget/grantleecontactviewer.h
diff --git a/libfollowupreminder/CMakeLists.txt \
b/kdepim-apps-lib/libfollowupreminder/CMakeLists.txt similarity index 97%
rename from libfollowupreminder/CMakeLists.txt
rename to kdepim-apps-lib/libfollowupreminder/CMakeLists.txt
index af929e8..c73234d 100644
--- a/libfollowupreminder/CMakeLists.txt
+++ b/kdepim-apps-lib/libfollowupreminder/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(followupreminder)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${followupreminder_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/libfollowupreminder/KF5FollowupReminderConfig.cmake.in \
b/kdepim-apps-lib/libfollowupreminder/KF5FollowupReminderConfig.cmake.in similarity \
index 100% rename from libfollowupreminder/KF5FollowupReminderConfig.cmake.in
rename to kdepim-apps-lib/libfollowupreminder/KF5FollowupReminderConfig.cmake.in
diff --git a/libfollowupreminder/KF5SendLaterConfig.cmake.in \
b/kdepim-apps-lib/libfollowupreminder/KF5SendLaterConfig.cmake.in similarity index \
100% rename from libfollowupreminder/KF5SendLaterConfig.cmake.in
rename to kdepim-apps-lib/libfollowupreminder/KF5SendLaterConfig.cmake.in
diff --git a/libfollowupreminder/src/CMakeLists.txt \
b/kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt similarity index 97%
rename from libfollowupreminder/src/CMakeLists.txt
rename to kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt
index af5a1eb..2e3d31e 100644
--- a/libfollowupreminder/src/CMakeLists.txt
+++ b/kdepim-apps-lib/libfollowupreminder/src/CMakeLists.txt
@@ -53,7 +53,7 @@ ecm_generate_pri_file(BASE_NAME FollowupReminder
     DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR \
${KDE_INSTALL_INCLUDEDIR_KF5}/FollowupReminder  )
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${followupreminder_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 install(FILES
     ${FollowupReminder_Camelcase_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/FollowupReminder
diff --git a/libfollowupreminder/src/Messages.sh \
b/kdepim-apps-lib/libfollowupreminder/src/Messages.sh similarity index 100%
rename from libfollowupreminder/src/Messages.sh
rename to kdepim-apps-lib/libfollowupreminder/src/Messages.sh
diff --git a/libfollowupreminder/src/followupreminderinfo.cpp \
b/kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.cpp similarity index \
100% rename from libfollowupreminder/src/followupreminderinfo.cpp
rename to kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.cpp
diff --git a/libfollowupreminder/src/followupreminderinfo.h \
b/kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.h similarity index \
100% rename from libfollowupreminder/src/followupreminderinfo.h
rename to kdepim-apps-lib/libfollowupreminder/src/followupreminderinfo.h
diff --git a/libfollowupreminder/src/followupreminderutil.cpp \
b/kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.cpp similarity index \
100% rename from libfollowupreminder/src/followupreminderutil.cpp
rename to kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.cpp
diff --git a/libfollowupreminder/src/followupreminderutil.h \
b/kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.h similarity index \
100% rename from libfollowupreminder/src/followupreminderutil.h
rename to kdepim-apps-lib/libfollowupreminder/src/followupreminderutil.h
diff --git a/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg \
b/kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg \
similarity index 100% rename from \
libfollowupreminder/src/settings/followupreminderagentsettings.kcfg rename to \
                kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfg
                
diff --git a/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc \
b/kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
 similarity index 100%
rename from libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
rename to kdepim-apps-lib/libfollowupreminder/src/settings/followupreminderagentsettings.kcfgc
                
diff --git a/libkdepimdbusinterfaces/CMakeLists.txt \
b/kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt similarity index 97%
rename from libkdepimdbusinterfaces/CMakeLists.txt
rename to kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt
index 93a5014..2e71e32 100644
--- a/libkdepimdbusinterfaces/CMakeLists.txt
+++ b/kdepim-apps-lib/libkdepimdbusinterfaces/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(kdepimdbusinterfaces)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepimdbusinterfaces_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in \
b/kdepim-apps-lib/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in \
similarity index 100% rename from \
libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in rename to \
                kdepim-apps-lib/libkdepimdbusinterfaces/KF5KdepimDBusInterfacesConfig.cmake.in
                
diff --git a/libkdepimdbusinterfaces/src/CMakeLists.txt \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt similarity index 97%
rename from libkdepimdbusinterfaces/src/CMakeLists.txt
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt
index f81368a..2261a9d 100644
--- a/libkdepimdbusinterfaces/src/CMakeLists.txt
+++ b/kdepim-apps-lib/libkdepimdbusinterfaces/src/CMakeLists.txt
@@ -64,7 +64,7 @@ ecm_generate_pri_file(BASE_NAME KdepimDBusInterfaces
 )
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepimdbusinterfaces_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 install(FILES
     ${kdepimdbusinterfaces_Camelcase_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KdepimDBusInterfaces
diff --git a/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h similarity \
index 100% rename from libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/kmkernel.h
diff --git a/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
 similarity index 100%
rename from libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.KOrgac.xml
                
diff --git a/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
 similarity index 100%
rename from libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
 rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/dbusinterfaces/org.kde.korganizer.Korganizer.xml
                
diff --git a/libkdepimdbusinterfaces/src/reminderclient.cpp \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.cpp similarity index \
100% rename from libkdepimdbusinterfaces/src/reminderclient.cpp
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.cpp
diff --git a/libkdepimdbusinterfaces/src/reminderclient.h \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.h similarity index 100%
rename from libkdepimdbusinterfaces/src/reminderclient.h
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/reminderclient.h
diff --git a/libkdepimdbusinterfaces/src/urihandler.cpp \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.cpp similarity index 100%
rename from libkdepimdbusinterfaces/src/urihandler.cpp
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.cpp
diff --git a/libkdepimdbusinterfaces/src/urihandler.h \
b/kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.h similarity index 100%
rename from libkdepimdbusinterfaces/src/urihandler.h
rename to kdepim-apps-lib/libkdepimdbusinterfaces/src/urihandler.h
diff --git a/libsendlater/CMakeLists.txt \
b/kdepim-apps-lib/libsendlater/CMakeLists.txt similarity index 97%
rename from libsendlater/CMakeLists.txt
rename to kdepim-apps-lib/libsendlater/CMakeLists.txt
index 88eda0c..2ab66de 100644
--- a/libsendlater/CMakeLists.txt
+++ b/kdepim-apps-lib/libsendlater/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(sendlater)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${sendlater_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/libsendlater/KF5SendLaterConfig.cmake.in \
b/kdepim-apps-lib/libsendlater/KF5SendLaterConfig.cmake.in similarity index 100%
rename from libsendlater/KF5SendLaterConfig.cmake.in
rename to kdepim-apps-lib/libsendlater/KF5SendLaterConfig.cmake.in
diff --git a/libsendlater/src/CMakeLists.txt \
b/kdepim-apps-lib/libsendlater/src/CMakeLists.txt similarity index 97%
rename from libsendlater/src/CMakeLists.txt
rename to kdepim-apps-lib/libsendlater/src/CMakeLists.txt
index 277463c..204e550 100644
--- a/libsendlater/src/CMakeLists.txt
+++ b/kdepim-apps-lib/libsendlater/src/CMakeLists.txt
@@ -62,7 +62,7 @@ ecm_generate_pri_file(BASE_NAME SendLater
     DEPS "AkonadiCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR \
${KDE_INSTALL_INCLUDEDIR_KF5}/SendLater  )
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${sendlater_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${kdepim-apps-lib_SOURCE_DIR})
 install(FILES
     ${SendLater_Camelcase_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/SendLater
diff --git a/libsendlater/src/Messages.sh \
b/kdepim-apps-lib/libsendlater/src/Messages.sh similarity index 100%
rename from libsendlater/src/Messages.sh
rename to kdepim-apps-lib/libsendlater/src/Messages.sh
diff --git a/libsendlater/src/sendlaterdialog.cpp \
b/kdepim-apps-lib/libsendlater/src/sendlaterdialog.cpp similarity index 100%
rename from libsendlater/src/sendlaterdialog.cpp
rename to kdepim-apps-lib/libsendlater/src/sendlaterdialog.cpp
diff --git a/libsendlater/src/sendlaterdialog.h \
b/kdepim-apps-lib/libsendlater/src/sendlaterdialog.h similarity index 100%
rename from libsendlater/src/sendlaterdialog.h
rename to kdepim-apps-lib/libsendlater/src/sendlaterdialog.h
diff --git a/libsendlater/src/sendlaterinfo.cpp \
b/kdepim-apps-lib/libsendlater/src/sendlaterinfo.cpp similarity index 100%
rename from libsendlater/src/sendlaterinfo.cpp
rename to kdepim-apps-lib/libsendlater/src/sendlaterinfo.cpp
diff --git a/libsendlater/src/sendlaterinfo.h \
b/kdepim-apps-lib/libsendlater/src/sendlaterinfo.h similarity index 100%
rename from libsendlater/src/sendlaterinfo.h
rename to kdepim-apps-lib/libsendlater/src/sendlaterinfo.h
diff --git a/libsendlater/src/sendlatertimedatewidget.cpp \
b/kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.cpp similarity index 100%
rename from libsendlater/src/sendlatertimedatewidget.cpp
rename to kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.cpp
diff --git a/libsendlater/src/sendlatertimedatewidget.h \
b/kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.h similarity index 100%
rename from libsendlater/src/sendlatertimedatewidget.h
rename to kdepim-apps-lib/libsendlater/src/sendlatertimedatewidget.h
diff --git a/libsendlater/src/sendlaterutil.cpp \
b/kdepim-apps-lib/libsendlater/src/sendlaterutil.cpp similarity index 100%
rename from libsendlater/src/sendlaterutil.cpp
rename to kdepim-apps-lib/libsendlater/src/sendlaterutil.cpp
diff --git a/libsendlater/src/sendlaterutil.h \
b/kdepim-apps-lib/libsendlater/src/sendlaterutil.h similarity index 100%
rename from libsendlater/src/sendlaterutil.h
rename to kdepim-apps-lib/libsendlater/src/sendlaterutil.h
diff --git a/libsendlater/src/settings/sendlateragentsettings.kcfg \
b/kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfg similarity \
index 100% rename from libsendlater/src/settings/sendlateragentsettings.kcfg
rename to kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfg
diff --git a/libsendlater/src/settings/sendlateragentsettings.kcfgc \
b/kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfgc similarity \
index 100% rename from libsendlater/src/settings/sendlateragentsettings.kcfgc
rename to kdepim-apps-lib/libsendlater/src/settings/sendlateragentsettings.kcfgc
diff --git a/libsendlater/src/ui/sendlaterwidget.ui \
b/kdepim-apps-lib/libsendlater/src/ui/sendlaterwidget.ui similarity index 100%
rename from libsendlater/src/ui/sendlaterwidget.ui
rename to kdepim-apps-lib/libsendlater/src/ui/sendlaterwidget.ui
diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt
index cd0e595..a18dbb9 100644
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@ -40,7 +40,6 @@ find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5TemplateParser ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5TemplateParser ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
diff --git a/messagelib/CMakeLists.txt b/messagelib/CMakeLists.txt
new file mode 100644
index 0000000..ea4fb39
--- /dev/null
+++ b/messagelib/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(Messagelib)
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
+set(CMAKE_MODULE_PATH ${MessageLib_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
+endif()
+
+add_subdirectory(messageviewer)
+add_subdirectory(templateparser)
+add_subdirectory(messagecomposer)
+add_subdirectory(messagecore)
+add_subdirectory(messagelist)
+
diff --git a/messageviewer/cmake/modules/FindGpgme.cmake \
b/messagelib/cmake/modules/FindGpgme.cmake similarity index 100%
copy from messageviewer/cmake/modules/FindGpgme.cmake
copy to messagelib/cmake/modules/FindGpgme.cmake
diff --git a/messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake \
b/messagelib/cmake/modules/kdepim_add_gpg_crypto_test.cmake similarity index 100%
copy from messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake
copy to messagelib/cmake/modules/kdepim_add_gpg_crypto_test.cmake
diff --git a/messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
b/messagelib/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake similarity index \
100% copy from messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake
 copy to messagelib/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake
diff --git a/messagecomposer/CMakeLists.txt \
b/messagelib/messagecomposer/CMakeLists.txt similarity index 93%
rename from messagecomposer/CMakeLists.txt
rename to messagelib/messagecomposer/CMakeLists.txt
index eeb1614..14393a7 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagelib/messagecomposer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(messagecomposer)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${messagecomposer_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${messagecomposer_SOURCE_DIR}/cmake/modules \
${ECM_MODULE_PATH}) @@ -37,9 +37,6 @@ find_package(KF5I18n ${KF5_VERSION} CONFIG \
REQUIRED)  find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5TemplateParser ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5SendLater ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5FollowupReminder ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
@@ -50,7 +47,7 @@ find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG \
                REQUIRED)
-
+find_package(KF5WebKit ${KF5_VERSION} CONFIG REQUIRED)
 
 remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
diff --git a/messagecomposer/DESIGN b/messagelib/messagecomposer/DESIGN
similarity index 100%
rename from messagecomposer/DESIGN
rename to messagelib/messagecomposer/DESIGN
diff --git a/messagecomposer/KF5MessageComposerConfig.cmake.in \
b/messagelib/messagecomposer/KF5MessageComposerConfig.cmake.in similarity index 100%
rename from messagecomposer/KF5MessageComposerConfig.cmake.in
rename to messagelib/messagecomposer/KF5MessageComposerConfig.cmake.in
diff --git a/messagecomposer/TODO b/messagelib/messagecomposer/TODO
similarity index 100%
rename from messagecomposer/TODO
rename to messagelib/messagecomposer/TODO
diff --git a/messagecomposer/autotests/CMakeLists.txt \
b/messagelib/messagecomposer/autotests/CMakeLists.txt similarity index 100%
rename from messagecomposer/autotests/CMakeLists.txt
rename to messagelib/messagecomposer/autotests/CMakeLists.txt
diff --git a/messagecomposer/autotests/attachmentjobtest.cpp \
b/messagelib/messagecomposer/autotests/attachmentjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/attachmentjobtest.cpp
rename to messagelib/messagecomposer/autotests/attachmentjobtest.cpp
diff --git a/messagecomposer/autotests/attachmentjobtest.h \
b/messagelib/messagecomposer/autotests/attachmentjobtest.h similarity index 100%
rename from messagecomposer/autotests/attachmentjobtest.h
rename to messagelib/messagecomposer/autotests/attachmentjobtest.h
diff --git a/messagecomposer/autotests/attachments/ascii.txt \
b/messagelib/messagecomposer/autotests/attachments/ascii.txt similarity index 100%
rename from messagecomposer/autotests/attachments/ascii.txt
rename to messagelib/messagecomposer/autotests/attachments/ascii.txt
diff --git a/messagecomposer/autotests/attachments/iso8859-2.txt \
b/messagelib/messagecomposer/autotests/attachments/iso8859-2.txt similarity index \
100% rename from messagecomposer/autotests/attachments/iso8859-2.txt
rename to messagelib/messagecomposer/autotests/attachments/iso8859-2.txt
diff --git a/messagecomposer/autotests/attachments/utf16.txt \
b/messagelib/messagecomposer/autotests/attachments/utf16.txt similarity index 100%
rename from messagecomposer/autotests/attachments/utf16.txt
rename to messagelib/messagecomposer/autotests/attachments/utf16.txt
diff --git a/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp \
b/messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp \
similarity index 100% rename from \
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp rename to \
                messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp
                
diff --git a/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h \
b/messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h \
similarity index 100% rename from \
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h rename to \
                messagelib/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h
                
diff --git a/messagecomposer/autotests/composertest.cpp \
b/messagelib/messagecomposer/autotests/composertest.cpp similarity index 100%
rename from messagecomposer/autotests/composertest.cpp
rename to messagelib/messagecomposer/autotests/composertest.cpp
diff --git a/messagecomposer/autotests/composertest.h \
b/messagelib/messagecomposer/autotests/composertest.h similarity index 100%
rename from messagecomposer/autotests/composertest.h
rename to messagelib/messagecomposer/autotests/composertest.h
diff --git a/messagecomposer/autotests/composerviewbasetest.cpp \
b/messagelib/messagecomposer/autotests/composerviewbasetest.cpp similarity index 100%
rename from messagecomposer/autotests/composerviewbasetest.cpp
rename to messagelib/messagecomposer/autotests/composerviewbasetest.cpp
diff --git a/messagecomposer/autotests/composerviewbasetest.h \
b/messagelib/messagecomposer/autotests/composerviewbasetest.h similarity index 100%
rename from messagecomposer/autotests/composerviewbasetest.h
rename to messagelib/messagecomposer/autotests/composerviewbasetest.h
diff --git a/messagecomposer/autotests/cryptocomposertest.cpp \
b/messagelib/messagecomposer/autotests/cryptocomposertest.cpp similarity index 100%
rename from messagecomposer/autotests/cryptocomposertest.cpp
rename to messagelib/messagecomposer/autotests/cryptocomposertest.cpp
diff --git a/messagecomposer/autotests/cryptocomposertest.h \
b/messagelib/messagecomposer/autotests/cryptocomposertest.h similarity index 100%
rename from messagecomposer/autotests/cryptocomposertest.h
rename to messagelib/messagecomposer/autotests/cryptocomposertest.h
diff --git a/messagecomposer/autotests/cryptofunctions.cpp \
b/messagelib/messagecomposer/autotests/cryptofunctions.cpp similarity index 100%
rename from messagecomposer/autotests/cryptofunctions.cpp
rename to messagelib/messagecomposer/autotests/cryptofunctions.cpp
diff --git a/messagecomposer/autotests/cryptofunctions.h \
b/messagelib/messagecomposer/autotests/cryptofunctions.h similarity index 100%
rename from messagecomposer/autotests/cryptofunctions.h
rename to messagelib/messagecomposer/autotests/cryptofunctions.h
diff --git a/messagecomposer/autotests/data/html_utf8_encoded.mbox \
b/messagelib/messagecomposer/autotests/data/html_utf8_encoded.mbox similarity index \
100% rename from messagecomposer/autotests/data/html_utf8_encoded.mbox
rename to messagelib/messagecomposer/autotests/data/html_utf8_encoded.mbox
diff --git a/messagecomposer/autotests/data/plain_message.mbox \
b/messagelib/messagecomposer/autotests/data/plain_message.mbox similarity index 100%
rename from messagecomposer/autotests/data/plain_message.mbox
rename to messagelib/messagecomposer/autotests/data/plain_message.mbox
diff --git a/messagecomposer/autotests/data/plain_utf16.mbox \
b/messagelib/messagecomposer/autotests/data/plain_utf16.mbox similarity index 100%
rename from messagecomposer/autotests/data/plain_utf16.mbox
rename to messagelib/messagecomposer/autotests/data/plain_utf16.mbox
diff --git a/messagecomposer/autotests/encryptjobtest.cpp \
b/messagelib/messagecomposer/autotests/encryptjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/encryptjobtest.cpp
rename to messagelib/messagecomposer/autotests/encryptjobtest.cpp
diff --git a/messagecomposer/autotests/encryptjobtest.h \
b/messagelib/messagecomposer/autotests/encryptjobtest.h similarity index 100%
rename from messagecomposer/autotests/encryptjobtest.h
rename to messagelib/messagecomposer/autotests/encryptjobtest.h
diff --git a/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp \
b/messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp \
similarity index 100% rename from \
messagecomposer/autotests/followupreminderselectdatedialogtest.cpp rename to \
                messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp
                
diff --git a/messagecomposer/autotests/followupreminderselectdatedialogtest.h \
b/messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.h \
similarity index 100% rename from \
messagecomposer/autotests/followupreminderselectdatedialogtest.h rename to \
                messagelib/messagecomposer/autotests/followupreminderselectdatedialogtest.h
                
diff --git a/messagecomposer/autotests/globalparttest.cpp \
b/messagelib/messagecomposer/autotests/globalparttest.cpp similarity index 100%
rename from messagecomposer/autotests/globalparttest.cpp
rename to messagelib/messagecomposer/autotests/globalparttest.cpp
diff --git a/messagecomposer/autotests/globalparttest.h \
b/messagelib/messagecomposer/autotests/globalparttest.h similarity index 100%
rename from messagecomposer/autotests/globalparttest.h
rename to messagelib/messagecomposer/autotests/globalparttest.h
diff --git a/messagecomposer/autotests/infoparttest.cpp \
b/messagelib/messagecomposer/autotests/infoparttest.cpp similarity index 100%
rename from messagecomposer/autotests/infoparttest.cpp
rename to messagelib/messagecomposer/autotests/infoparttest.cpp
diff --git a/messagecomposer/autotests/infoparttest.h \
b/messagelib/messagecomposer/autotests/infoparttest.h similarity index 100%
rename from messagecomposer/autotests/infoparttest.h
rename to messagelib/messagecomposer/autotests/infoparttest.h
diff --git a/messagecomposer/autotests/maintextjobtest.cpp \
b/messagelib/messagecomposer/autotests/maintextjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/maintextjobtest.cpp
rename to messagelib/messagecomposer/autotests/maintextjobtest.cpp
diff --git a/messagecomposer/autotests/maintextjobtest.h \
b/messagelib/messagecomposer/autotests/maintextjobtest.h similarity index 100%
rename from messagecomposer/autotests/maintextjobtest.h
rename to messagelib/messagecomposer/autotests/maintextjobtest.h
diff --git a/messagecomposer/autotests/messagefactorytest.cpp \
b/messagelib/messagecomposer/autotests/messagefactorytest.cpp similarity index 100%
rename from messagecomposer/autotests/messagefactorytest.cpp
rename to messagelib/messagecomposer/autotests/messagefactorytest.cpp
diff --git a/messagecomposer/autotests/messagefactorytest.h \
b/messagelib/messagecomposer/autotests/messagefactorytest.h similarity index 100%
rename from messagecomposer/autotests/messagefactorytest.h
rename to messagelib/messagecomposer/autotests/messagefactorytest.h
diff --git a/messagecomposer/autotests/multipartjobtest.cpp \
b/messagelib/messagecomposer/autotests/multipartjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/multipartjobtest.cpp
rename to messagelib/messagecomposer/autotests/multipartjobtest.cpp
diff --git a/messagecomposer/autotests/multipartjobtest.h \
b/messagelib/messagecomposer/autotests/multipartjobtest.h similarity index 100%
rename from messagecomposer/autotests/multipartjobtest.h
rename to messagelib/messagecomposer/autotests/multipartjobtest.h
diff --git a/messagecomposer/autotests/qtest_messagecomposer.h \
b/messagelib/messagecomposer/autotests/qtest_messagecomposer.h similarity index 100%
rename from messagecomposer/autotests/qtest_messagecomposer.h
rename to messagelib/messagecomposer/autotests/qtest_messagecomposer.h
diff --git a/messagecomposer/autotests/setupenv.cpp \
b/messagelib/messagecomposer/autotests/setupenv.cpp similarity index 100%
rename from messagecomposer/autotests/setupenv.cpp
rename to messagelib/messagecomposer/autotests/setupenv.cpp
diff --git a/messagecomposer/autotests/setupenv.h \
b/messagelib/messagecomposer/autotests/setupenv.h similarity index 100%
rename from messagecomposer/autotests/setupenv.h
rename to messagelib/messagecomposer/autotests/setupenv.h
diff --git a/messagecomposer/autotests/signencrypttest.cpp \
b/messagelib/messagecomposer/autotests/signencrypttest.cpp similarity index 100%
rename from messagecomposer/autotests/signencrypttest.cpp
rename to messagelib/messagecomposer/autotests/signencrypttest.cpp
diff --git a/messagecomposer/autotests/signencrypttest.h \
b/messagelib/messagecomposer/autotests/signencrypttest.h similarity index 100%
rename from messagecomposer/autotests/signencrypttest.h
rename to messagelib/messagecomposer/autotests/signencrypttest.h
diff --git a/messagecomposer/autotests/signjobtest.cpp \
b/messagelib/messagecomposer/autotests/signjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/signjobtest.cpp
rename to messagelib/messagecomposer/autotests/signjobtest.cpp
diff --git a/messagecomposer/autotests/signjobtest.h \
b/messagelib/messagecomposer/autotests/signjobtest.h similarity index 100%
rename from messagecomposer/autotests/signjobtest.h
rename to messagelib/messagecomposer/autotests/signjobtest.h
diff --git a/messagecomposer/autotests/singlepartjobtest.cpp \
b/messagelib/messagecomposer/autotests/singlepartjobtest.cpp similarity index 100%
rename from messagecomposer/autotests/singlepartjobtest.cpp
rename to messagelib/messagecomposer/autotests/singlepartjobtest.cpp
diff --git a/messagecomposer/autotests/singlepartjobtest.h \
b/messagelib/messagecomposer/autotests/singlepartjobtest.h similarity index 100%
rename from messagecomposer/autotests/singlepartjobtest.h
rename to messagelib/messagecomposer/autotests/singlepartjobtest.h
diff --git a/messagecomposer/autotests/skeletonmessagejobtest.cpp \
b/messagelib/messagecomposer/autotests/skeletonmessagejobtest.cpp similarity index \
100% rename from messagecomposer/autotests/skeletonmessagejobtest.cpp
rename to messagelib/messagecomposer/autotests/skeletonmessagejobtest.cpp
diff --git a/messagecomposer/autotests/skeletonmessagejobtest.h \
b/messagelib/messagecomposer/autotests/skeletonmessagejobtest.h similarity index 100%
rename from messagecomposer/autotests/skeletonmessagejobtest.h
rename to messagelib/messagecomposer/autotests/skeletonmessagejobtest.h
diff --git a/messagecomposer/autotests/testcsshelper.h \
b/messagelib/messagecomposer/autotests/testcsshelper.h similarity index 100%
rename from messagecomposer/autotests/testcsshelper.h
rename to messagelib/messagecomposer/autotests/testcsshelper.h
diff --git a/messagecomposer/autotests/testhtmlwriter.h \
b/messagelib/messagecomposer/autotests/testhtmlwriter.h similarity index 100%
rename from messagecomposer/autotests/testhtmlwriter.h
rename to messagelib/messagecomposer/autotests/testhtmlwriter.h
diff --git a/messagecomposer/autotests/textparttest.cpp \
b/messagelib/messagecomposer/autotests/textparttest.cpp similarity index 100%
rename from messagecomposer/autotests/textparttest.cpp
rename to messagelib/messagecomposer/autotests/textparttest.cpp
diff --git a/messagecomposer/autotests/textparttest.h \
b/messagelib/messagecomposer/autotests/textparttest.h similarity index 100%
rename from messagecomposer/autotests/textparttest.h
rename to messagelib/messagecomposer/autotests/textparttest.h
diff --git a/messagecomposer/autotests/unittestenv/config-sqlite-db.xml \
b/messagelib/messagecomposer/autotests/unittestenv/config-sqlite-db.xml similarity \
index 100% rename from messagecomposer/autotests/unittestenv/config-sqlite-db.xml
rename to messagelib/messagecomposer/autotests/unittestenv/config-sqlite-db.xml
diff --git a/messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
b/messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
 similarity index 100%
rename from messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
 rename to messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
                
diff --git a/messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc \
b/messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc \
similarity index 100% rename from \
messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc rename to \
                messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdebugrc
                
diff --git a/messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc \
b/messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc \
similarity index 100% rename from \
messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc rename to \
                messagelib/messagecomposer/autotests/unittestenv/kdehome/share/config/kdedrc
                
diff --git a/messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
b/messagelib/messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
 similarity index 100%
rename from messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
 rename to messagelib/messagecomposer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
                
diff --git a/messagecomposer/autotests/utiltest.cpp \
b/messagelib/messagecomposer/autotests/utiltest.cpp similarity index 100%
rename from messagecomposer/autotests/utiltest.cpp
rename to messagelib/messagecomposer/autotests/utiltest.cpp
diff --git a/messagecomposer/autotests/utiltest.h \
b/messagelib/messagecomposer/autotests/utiltest.h similarity index 100%
rename from messagecomposer/autotests/utiltest.h
rename to messagelib/messagecomposer/autotests/utiltest.h
diff --git a/messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake \
b/messagelib/messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake \
similarity index 100% rename from \
messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake rename to \
                messagelib/messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake
                
diff --git a/messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
b/messagelib/messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
similarity index 100% rename from \
messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake rename to \
                messagelib/messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake
                
diff --git a/messagecomposer/src/CMakeLists.txt \
b/messagelib/messagecomposer/src/CMakeLists.txt similarity index 99%
rename from messagecomposer/src/CMakeLists.txt
rename to messagelib/messagecomposer/src/CMakeLists.txt
index f15d0cb..a6b2862 100644
--- a/messagecomposer/src/CMakeLists.txt
+++ b/messagelib/messagecomposer/src/CMakeLists.txt
@@ -297,7 +297,7 @@ ecm_generate_pri_file(BASE_NAME MessageComposer
 )
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${messagecomposer_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 install(FILES
     ${MessageComposer_Camelcasecomposer_HEADERS}
     ${MessageComposer_Camelcasecomposerng_HEADERS}
diff --git a/messagecomposer/src/COMPLIANCE \
b/messagelib/messagecomposer/src/COMPLIANCE similarity index 100%
rename from messagecomposer/src/COMPLIANCE
rename to messagelib/messagecomposer/src/COMPLIANCE
diff --git a/messagecomposer/src/Messages.sh \
b/messagelib/messagecomposer/src/Messages.sh similarity index 100%
rename from messagecomposer/src/Messages.sh
rename to messagelib/messagecomposer/src/Messages.sh
diff --git a/messagecomposer/src/attachment/attachmentcontrollerbase.cpp \
b/messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.cpp similarity \
index 100% rename from messagecomposer/src/attachment/attachmentcontrollerbase.cpp
rename to messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.cpp
diff --git a/messagecomposer/src/attachment/attachmentcontrollerbase.h \
b/messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.h similarity \
index 100% rename from messagecomposer/src/attachment/attachmentcontrollerbase.h
rename to messagelib/messagecomposer/src/attachment/attachmentcontrollerbase.h
diff --git a/messagecomposer/src/attachment/attachmentmodel.cpp \
b/messagelib/messagecomposer/src/attachment/attachmentmodel.cpp similarity index 100%
rename from messagecomposer/src/attachment/attachmentmodel.cpp
rename to messagelib/messagecomposer/src/attachment/attachmentmodel.cpp
diff --git a/messagecomposer/src/attachment/attachmentmodel.h \
b/messagelib/messagecomposer/src/attachment/attachmentmodel.h similarity index 100%
rename from messagecomposer/src/attachment/attachmentmodel.h
rename to messagelib/messagecomposer/src/attachment/attachmentmodel.h
diff --git a/messagecomposer/src/composer-ng/richtextcomposerng.cpp \
b/messagelib/messagecomposer/src/composer-ng/richtextcomposerng.cpp similarity index \
100% rename from messagecomposer/src/composer-ng/richtextcomposerng.cpp
rename to messagelib/messagecomposer/src/composer-ng/richtextcomposerng.cpp
diff --git a/messagecomposer/src/composer-ng/richtextcomposerng.h \
b/messagelib/messagecomposer/src/composer-ng/richtextcomposerng.h similarity index \
100% rename from messagecomposer/src/composer-ng/richtextcomposerng.h
rename to messagelib/messagecomposer/src/composer-ng/richtextcomposerng.h
diff --git a/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp \
b/messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp \
similarity index 100% rename from \
messagecomposer/src/composer-ng/richtextcomposersignatures.cpp rename to \
                messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp
                
diff --git a/messagecomposer/src/composer-ng/richtextcomposersignatures.h \
b/messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.h similarity \
index 100% rename from messagecomposer/src/composer-ng/richtextcomposersignatures.h
rename to messagelib/messagecomposer/src/composer-ng/richtextcomposersignatures.h
diff --git a/messagecomposer/src/composer/composer.cpp \
b/messagelib/messagecomposer/src/composer/composer.cpp similarity index 100%
rename from messagecomposer/src/composer/composer.cpp
rename to messagelib/messagecomposer/src/composer/composer.cpp
diff --git a/messagecomposer/src/composer/composer.h \
b/messagelib/messagecomposer/src/composer/composer.h similarity index 100%
rename from messagecomposer/src/composer/composer.h
rename to messagelib/messagecomposer/src/composer/composer.h
diff --git a/messagecomposer/src/composer/composerlineedit.cpp \
b/messagelib/messagecomposer/src/composer/composerlineedit.cpp similarity index 100%
rename from messagecomposer/src/composer/composerlineedit.cpp
rename to messagelib/messagecomposer/src/composer/composerlineedit.cpp
diff --git a/messagecomposer/src/composer/composerlineedit.h \
b/messagelib/messagecomposer/src/composer/composerlineedit.h similarity index 100%
rename from messagecomposer/src/composer/composerlineedit.h
rename to messagelib/messagecomposer/src/composer/composerlineedit.h
diff --git a/messagecomposer/src/composer/composerviewbase.cpp \
b/messagelib/messagecomposer/src/composer/composerviewbase.cpp similarity index 100%
rename from messagecomposer/src/composer/composerviewbase.cpp
rename to messagelib/messagecomposer/src/composer/composerviewbase.cpp
diff --git a/messagecomposer/src/composer/composerviewbase.h \
b/messagelib/messagecomposer/src/composer/composerviewbase.h similarity index 100%
rename from messagecomposer/src/composer/composerviewbase.h
rename to messagelib/messagecomposer/src/composer/composerviewbase.h
diff --git a/messagecomposer/src/composer/keyresolver.cpp \
b/messagelib/messagecomposer/src/composer/keyresolver.cpp similarity index 100%
rename from messagecomposer/src/composer/keyresolver.cpp
rename to messagelib/messagecomposer/src/composer/keyresolver.cpp
diff --git a/messagecomposer/src/composer/keyresolver.h \
b/messagelib/messagecomposer/src/composer/keyresolver.h similarity index 100%
rename from messagecomposer/src/composer/keyresolver.h
rename to messagelib/messagecomposer/src/composer/keyresolver.h
diff --git a/messagecomposer/src/composer/signaturecontroller.cpp \
b/messagelib/messagecomposer/src/composer/signaturecontroller.cpp similarity index \
100% rename from messagecomposer/src/composer/signaturecontroller.cpp
rename to messagelib/messagecomposer/src/composer/signaturecontroller.cpp
diff --git a/messagecomposer/src/composer/signaturecontroller.h \
b/messagelib/messagecomposer/src/composer/signaturecontroller.h similarity index 100%
rename from messagecomposer/src/composer/signaturecontroller.h
rename to messagelib/messagecomposer/src/composer/signaturecontroller.h
diff --git a/messagecomposer/src/followupreminder/followupremindercreatejob.cpp \
b/messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.cpp \
similarity index 100% rename from \
messagecomposer/src/followupreminder/followupremindercreatejob.cpp rename to \
                messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.cpp
                
diff --git a/messagecomposer/src/followupreminder/followupremindercreatejob.h \
b/messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.h \
similarity index 100% rename from \
messagecomposer/src/followupreminder/followupremindercreatejob.h rename to \
                messagelib/messagecomposer/src/followupreminder/followupremindercreatejob.h
                
diff --git a/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp \
b/messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp
 similarity index 100%
rename from messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp
rename to messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp
                
diff --git a/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h \
b/messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h \
similarity index 100% rename from \
messagecomposer/src/followupreminder/followupreminderselectdatedialog.h rename to \
                messagelib/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h
                
diff --git a/messagecomposer/src/helper/messagefactory.cpp \
b/messagelib/messagecomposer/src/helper/messagefactory.cpp similarity index 100%
rename from messagecomposer/src/helper/messagefactory.cpp
rename to messagelib/messagecomposer/src/helper/messagefactory.cpp
diff --git a/messagecomposer/src/helper/messagefactory.h \
b/messagelib/messagecomposer/src/helper/messagefactory.h similarity index 100%
rename from messagecomposer/src/helper/messagefactory.h
rename to messagelib/messagecomposer/src/helper/messagefactory.h
diff --git a/messagecomposer/src/helper/messagehelper.cpp \
b/messagelib/messagecomposer/src/helper/messagehelper.cpp similarity index 100%
rename from messagecomposer/src/helper/messagehelper.cpp
rename to messagelib/messagecomposer/src/helper/messagehelper.cpp
diff --git a/messagecomposer/src/helper/messagehelper.h \
b/messagelib/messagecomposer/src/helper/messagehelper.h similarity index 100%
rename from messagecomposer/src/helper/messagehelper.h
rename to messagelib/messagecomposer/src/helper/messagehelper.h
diff --git a/messagecomposer/src/imagescaling/autotests/CMakeLists.txt \
b/messagelib/messagecomposer/src/imagescaling/autotests/CMakeLists.txt similarity \
index 100% rename from messagecomposer/src/imagescaling/autotests/CMakeLists.txt
rename to messagelib/messagecomposer/src/imagescaling/autotests/CMakeLists.txt
diff --git a/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp \
b/messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp \
similarity index 100% rename from \
messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp rename to \
                messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
                
diff --git a/messagecomposer/src/imagescaling/autotests/imagescalingtest.h \
b/messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.h similarity \
index 100% rename from messagecomposer/src/imagescaling/autotests/imagescalingtest.h
rename to messagelib/messagecomposer/src/imagescaling/autotests/imagescalingtest.h
diff --git a/messagecomposer/src/imagescaling/imagescaling.cpp \
b/messagelib/messagecomposer/src/imagescaling/imagescaling.cpp similarity index 100%
rename from messagecomposer/src/imagescaling/imagescaling.cpp
rename to messagelib/messagecomposer/src/imagescaling/imagescaling.cpp
diff --git a/messagecomposer/src/imagescaling/imagescaling.h \
b/messagelib/messagecomposer/src/imagescaling/imagescaling.h similarity index 100%
rename from messagecomposer/src/imagescaling/imagescaling.h
rename to messagelib/messagecomposer/src/imagescaling/imagescaling.h
diff --git a/messagecomposer/src/imagescaling/imagescalingselectformat.cpp \
b/messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.cpp similarity \
index 100% rename from messagecomposer/src/imagescaling/imagescalingselectformat.cpp
rename to messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.cpp
diff --git a/messagecomposer/src/imagescaling/imagescalingselectformat.h \
b/messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.h similarity \
index 100% rename from messagecomposer/src/imagescaling/imagescalingselectformat.h
rename to messagelib/messagecomposer/src/imagescaling/imagescalingselectformat.h
diff --git a/messagecomposer/src/imagescaling/imagescalingutils.cpp \
b/messagelib/messagecomposer/src/imagescaling/imagescalingutils.cpp similarity index \
100% rename from messagecomposer/src/imagescaling/imagescalingutils.cpp
rename to messagelib/messagecomposer/src/imagescaling/imagescalingutils.cpp
diff --git a/messagecomposer/src/imagescaling/imagescalingutils.h \
b/messagelib/messagecomposer/src/imagescaling/imagescalingutils.h similarity index \
100% rename from messagecomposer/src/imagescaling/imagescalingutils.h
rename to messagelib/messagecomposer/src/imagescaling/imagescalingutils.h
diff --git a/messagecomposer/src/imagescaling/imagescalingwidget.cpp \
b/messagelib/messagecomposer/src/imagescaling/imagescalingwidget.cpp similarity index \
100% rename from messagecomposer/src/imagescaling/imagescalingwidget.cpp
rename to messagelib/messagecomposer/src/imagescaling/imagescalingwidget.cpp
diff --git a/messagecomposer/src/imagescaling/imagescalingwidget.h \
b/messagelib/messagecomposer/src/imagescaling/imagescalingwidget.h similarity index \
100% rename from messagecomposer/src/imagescaling/imagescalingwidget.h
rename to messagelib/messagecomposer/src/imagescaling/imagescalingwidget.h
diff --git a/messagecomposer/src/imagescaling/tests/CMakeLists.txt \
b/messagelib/messagecomposer/src/imagescaling/tests/CMakeLists.txt similarity index \
100% rename from messagecomposer/src/imagescaling/tests/CMakeLists.txt
rename to messagelib/messagecomposer/src/imagescaling/tests/CMakeLists.txt
diff --git a/messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp \
b/messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp similarity \
index 100% rename from messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp
rename to messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.cpp
diff --git a/messagecomposer/src/imagescaling/tests/imagescaling_gui.h \
b/messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.h similarity \
index 100% rename from messagecomposer/src/imagescaling/tests/imagescaling_gui.h
rename to messagelib/messagecomposer/src/imagescaling/tests/imagescaling_gui.h
diff --git a/messagecomposer/src/imagescaling/ui/imagescalingwidget.ui \
b/messagelib/messagecomposer/src/imagescaling/ui/imagescalingwidget.ui similarity \
index 100% rename from messagecomposer/src/imagescaling/ui/imagescalingwidget.ui
rename to messagelib/messagecomposer/src/imagescaling/ui/imagescalingwidget.ui
diff --git a/messagecomposer/src/job/abstractencryptjob.h \
b/messagelib/messagecomposer/src/job/abstractencryptjob.h similarity index 100%
rename from messagecomposer/src/job/abstractencryptjob.h
rename to messagelib/messagecomposer/src/job/abstractencryptjob.h
diff --git a/messagecomposer/src/job/aliasesexpandjob.cpp \
b/messagelib/messagecomposer/src/job/aliasesexpandjob.cpp similarity index 100%
rename from messagecomposer/src/job/aliasesexpandjob.cpp
rename to messagelib/messagecomposer/src/job/aliasesexpandjob.cpp
diff --git a/messagecomposer/src/job/aliasesexpandjob.h \
b/messagelib/messagecomposer/src/job/aliasesexpandjob.h similarity index 100%
rename from messagecomposer/src/job/aliasesexpandjob.h
rename to messagelib/messagecomposer/src/job/aliasesexpandjob.h
diff --git a/messagecomposer/src/job/attachmentfrompublickeyjob.cpp \
b/messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.cpp similarity index \
100% rename from messagecomposer/src/job/attachmentfrompublickeyjob.cpp
rename to messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.cpp
diff --git a/messagecomposer/src/job/attachmentfrompublickeyjob.h \
b/messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.h similarity index \
100% rename from messagecomposer/src/job/attachmentfrompublickeyjob.h
rename to messagelib/messagecomposer/src/job/attachmentfrompublickeyjob.h
diff --git a/messagecomposer/src/job/attachmentjob.cpp \
b/messagelib/messagecomposer/src/job/attachmentjob.cpp similarity index 100%
rename from messagecomposer/src/job/attachmentjob.cpp
rename to messagelib/messagecomposer/src/job/attachmentjob.cpp
diff --git a/messagecomposer/src/job/attachmentjob.h \
b/messagelib/messagecomposer/src/job/attachmentjob.h similarity index 100%
rename from messagecomposer/src/job/attachmentjob.h
rename to messagelib/messagecomposer/src/job/attachmentjob.h
diff --git a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp \
b/messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp similarity \
index 100% rename from messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
rename to messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
diff --git a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h \
b/messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h similarity \
index 100% rename from messagecomposer/src/job/attachmentvcardfromaddressbookjob.h
rename to messagelib/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h
diff --git a/messagecomposer/src/job/contentjobbase.cpp \
b/messagelib/messagecomposer/src/job/contentjobbase.cpp similarity index 100%
rename from messagecomposer/src/job/contentjobbase.cpp
rename to messagelib/messagecomposer/src/job/contentjobbase.cpp
diff --git a/messagecomposer/src/job/contentjobbase.h \
b/messagelib/messagecomposer/src/job/contentjobbase.h similarity index 100%
rename from messagecomposer/src/job/contentjobbase.h
rename to messagelib/messagecomposer/src/job/contentjobbase.h
diff --git a/messagecomposer/src/job/contentjobbase_p.h \
b/messagelib/messagecomposer/src/job/contentjobbase_p.h similarity index 100%
rename from messagecomposer/src/job/contentjobbase_p.h
rename to messagelib/messagecomposer/src/job/contentjobbase_p.h
diff --git a/messagecomposer/src/job/distributionlistexpandjob.cpp \
b/messagelib/messagecomposer/src/job/distributionlistexpandjob.cpp similarity index \
100% rename from messagecomposer/src/job/distributionlistexpandjob.cpp
rename to messagelib/messagecomposer/src/job/distributionlistexpandjob.cpp
diff --git a/messagecomposer/src/job/distributionlistexpandjob.h \
b/messagelib/messagecomposer/src/job/distributionlistexpandjob.h similarity index \
100% rename from messagecomposer/src/job/distributionlistexpandjob.h
rename to messagelib/messagecomposer/src/job/distributionlistexpandjob.h
diff --git a/messagecomposer/src/job/emailaddressresolvejob.cpp \
b/messagelib/messagecomposer/src/job/emailaddressresolvejob.cpp similarity index 100%
rename from messagecomposer/src/job/emailaddressresolvejob.cpp
rename to messagelib/messagecomposer/src/job/emailaddressresolvejob.cpp
diff --git a/messagecomposer/src/job/emailaddressresolvejob.h \
b/messagelib/messagecomposer/src/job/emailaddressresolvejob.h similarity index 100%
rename from messagecomposer/src/job/emailaddressresolvejob.h
rename to messagelib/messagecomposer/src/job/emailaddressresolvejob.h
diff --git a/messagecomposer/src/job/encryptjob.cpp \
b/messagelib/messagecomposer/src/job/encryptjob.cpp similarity index 100%
rename from messagecomposer/src/job/encryptjob.cpp
rename to messagelib/messagecomposer/src/job/encryptjob.cpp
diff --git a/messagecomposer/src/job/encryptjob.h \
b/messagelib/messagecomposer/src/job/encryptjob.h similarity index 100%
rename from messagecomposer/src/job/encryptjob.h
rename to messagelib/messagecomposer/src/job/encryptjob.h
diff --git a/messagecomposer/src/job/inserttextfilejob.cpp \
b/messagelib/messagecomposer/src/job/inserttextfilejob.cpp similarity index 100%
rename from messagecomposer/src/job/inserttextfilejob.cpp
rename to messagelib/messagecomposer/src/job/inserttextfilejob.cpp
diff --git a/messagecomposer/src/job/inserttextfilejob.h \
b/messagelib/messagecomposer/src/job/inserttextfilejob.h similarity index 100%
rename from messagecomposer/src/job/inserttextfilejob.h
rename to messagelib/messagecomposer/src/job/inserttextfilejob.h
diff --git a/messagecomposer/src/job/jobbase.cpp \
b/messagelib/messagecomposer/src/job/jobbase.cpp similarity index 100%
rename from messagecomposer/src/job/jobbase.cpp
rename to messagelib/messagecomposer/src/job/jobbase.cpp
diff --git a/messagecomposer/src/job/jobbase.h \
b/messagelib/messagecomposer/src/job/jobbase.h similarity index 100%
rename from messagecomposer/src/job/jobbase.h
rename to messagelib/messagecomposer/src/job/jobbase.h
diff --git a/messagecomposer/src/job/jobbase_p.h \
b/messagelib/messagecomposer/src/job/jobbase_p.h similarity index 100%
rename from messagecomposer/src/job/jobbase_p.h
rename to messagelib/messagecomposer/src/job/jobbase_p.h
diff --git a/messagecomposer/src/job/maintextjob.cpp \
b/messagelib/messagecomposer/src/job/maintextjob.cpp similarity index 100%
rename from messagecomposer/src/job/maintextjob.cpp
rename to messagelib/messagecomposer/src/job/maintextjob.cpp
diff --git a/messagecomposer/src/job/maintextjob.h \
b/messagelib/messagecomposer/src/job/maintextjob.h similarity index 100%
rename from messagecomposer/src/job/maintextjob.h
rename to messagelib/messagecomposer/src/job/maintextjob.h
diff --git a/messagecomposer/src/job/multipartjob.cpp \
b/messagelib/messagecomposer/src/job/multipartjob.cpp similarity index 100%
rename from messagecomposer/src/job/multipartjob.cpp
rename to messagelib/messagecomposer/src/job/multipartjob.cpp
diff --git a/messagecomposer/src/job/multipartjob.h \
b/messagelib/messagecomposer/src/job/multipartjob.h similarity index 100%
rename from messagecomposer/src/job/multipartjob.h
rename to messagelib/messagecomposer/src/job/multipartjob.h
diff --git a/messagecomposer/src/job/savecontactpreferencejob.cpp \
b/messagelib/messagecomposer/src/job/savecontactpreferencejob.cpp similarity index \
100% rename from messagecomposer/src/job/savecontactpreferencejob.cpp
rename to messagelib/messagecomposer/src/job/savecontactpreferencejob.cpp
diff --git a/messagecomposer/src/job/savecontactpreferencejob.h \
b/messagelib/messagecomposer/src/job/savecontactpreferencejob.h similarity index 100%
rename from messagecomposer/src/job/savecontactpreferencejob.h
rename to messagelib/messagecomposer/src/job/savecontactpreferencejob.h
diff --git a/messagecomposer/src/job/signencryptjob.cpp \
b/messagelib/messagecomposer/src/job/signencryptjob.cpp similarity index 100%
rename from messagecomposer/src/job/signencryptjob.cpp
rename to messagelib/messagecomposer/src/job/signencryptjob.cpp
diff --git a/messagecomposer/src/job/signencryptjob.h \
b/messagelib/messagecomposer/src/job/signencryptjob.h similarity index 100%
rename from messagecomposer/src/job/signencryptjob.h
rename to messagelib/messagecomposer/src/job/signencryptjob.h
diff --git a/messagecomposer/src/job/signjob.cpp \
b/messagelib/messagecomposer/src/job/signjob.cpp similarity index 100%
rename from messagecomposer/src/job/signjob.cpp
rename to messagelib/messagecomposer/src/job/signjob.cpp
diff --git a/messagecomposer/src/job/signjob.h \
b/messagelib/messagecomposer/src/job/signjob.h similarity index 100%
rename from messagecomposer/src/job/signjob.h
rename to messagelib/messagecomposer/src/job/signjob.h
diff --git a/messagecomposer/src/job/singlepartjob.cpp \
b/messagelib/messagecomposer/src/job/singlepartjob.cpp similarity index 100%
rename from messagecomposer/src/job/singlepartjob.cpp
rename to messagelib/messagecomposer/src/job/singlepartjob.cpp
diff --git a/messagecomposer/src/job/singlepartjob.h \
b/messagelib/messagecomposer/src/job/singlepartjob.h similarity index 100%
rename from messagecomposer/src/job/singlepartjob.h
rename to messagelib/messagecomposer/src/job/singlepartjob.h
diff --git a/messagecomposer/src/job/skeletonmessagejob.cpp \
b/messagelib/messagecomposer/src/job/skeletonmessagejob.cpp similarity index 100%
rename from messagecomposer/src/job/skeletonmessagejob.cpp
rename to messagelib/messagecomposer/src/job/skeletonmessagejob.cpp
diff --git a/messagecomposer/src/job/skeletonmessagejob.h \
b/messagelib/messagecomposer/src/job/skeletonmessagejob.h similarity index 100%
rename from messagecomposer/src/job/skeletonmessagejob.h
rename to messagelib/messagecomposer/src/job/skeletonmessagejob.h
diff --git a/messagecomposer/src/job/transparentjob.cpp \
b/messagelib/messagecomposer/src/job/transparentjob.cpp similarity index 100%
rename from messagecomposer/src/job/transparentjob.cpp
rename to messagelib/messagecomposer/src/job/transparentjob.cpp
diff --git a/messagecomposer/src/job/transparentjob.h \
b/messagelib/messagecomposer/src/job/transparentjob.h similarity index 100%
rename from messagecomposer/src/job/transparentjob.h
rename to messagelib/messagecomposer/src/job/transparentjob.h
diff --git a/messagecomposer/src/kdepim-version.h.cmake \
b/messagelib/messagecomposer/src/kdepim-version.h.cmake similarity index 100%
rename from messagecomposer/src/kdepim-version.h.cmake
rename to messagelib/messagecomposer/src/kdepim-version.h.cmake
diff --git a/messagecomposer/src/part/globalpart.cpp \
b/messagelib/messagecomposer/src/part/globalpart.cpp similarity index 100%
rename from messagecomposer/src/part/globalpart.cpp
rename to messagelib/messagecomposer/src/part/globalpart.cpp
diff --git a/messagecomposer/src/part/globalpart.h \
b/messagelib/messagecomposer/src/part/globalpart.h similarity index 100%
rename from messagecomposer/src/part/globalpart.h
rename to messagelib/messagecomposer/src/part/globalpart.h
diff --git a/messagecomposer/src/part/infopart.cpp \
b/messagelib/messagecomposer/src/part/infopart.cpp similarity index 100%
rename from messagecomposer/src/part/infopart.cpp
rename to messagelib/messagecomposer/src/part/infopart.cpp
diff --git a/messagecomposer/src/part/infopart.h \
b/messagelib/messagecomposer/src/part/infopart.h similarity index 100%
rename from messagecomposer/src/part/infopart.h
rename to messagelib/messagecomposer/src/part/infopart.h
diff --git a/messagecomposer/src/part/messagepart.cpp \
b/messagelib/messagecomposer/src/part/messagepart.cpp similarity index 100%
rename from messagecomposer/src/part/messagepart.cpp
rename to messagelib/messagecomposer/src/part/messagepart.cpp
diff --git a/messagecomposer/src/part/messagepart.h \
b/messagelib/messagecomposer/src/part/messagepart.h similarity index 100%
rename from messagecomposer/src/part/messagepart.h
rename to messagelib/messagecomposer/src/part/messagepart.h
diff --git a/messagecomposer/src/part/textpart.cpp \
b/messagelib/messagecomposer/src/part/textpart.cpp similarity index 100%
rename from messagecomposer/src/part/textpart.cpp
rename to messagelib/messagecomposer/src/part/textpart.cpp
diff --git a/messagecomposer/src/part/textpart.h \
b/messagelib/messagecomposer/src/part/textpart.h similarity index 100%
rename from messagecomposer/src/part/textpart.h
rename to messagelib/messagecomposer/src/part/textpart.h
diff --git a/messagecomposer/src/recipient/distributionlistdialog.cpp \
b/messagelib/messagecomposer/src/recipient/distributionlistdialog.cpp similarity \
index 100% rename from messagecomposer/src/recipient/distributionlistdialog.cpp
rename to messagelib/messagecomposer/src/recipient/distributionlistdialog.cpp
diff --git a/messagecomposer/src/recipient/distributionlistdialog.h \
b/messagelib/messagecomposer/src/recipient/distributionlistdialog.h similarity index \
100% rename from messagecomposer/src/recipient/distributionlistdialog.h
rename to messagelib/messagecomposer/src/recipient/distributionlistdialog.h
diff --git a/messagecomposer/src/recipient/kwindowpositioner.cpp \
b/messagelib/messagecomposer/src/recipient/kwindowpositioner.cpp similarity index \
100% rename from messagecomposer/src/recipient/kwindowpositioner.cpp
rename to messagelib/messagecomposer/src/recipient/kwindowpositioner.cpp
diff --git a/messagecomposer/src/recipient/kwindowpositioner.h \
b/messagelib/messagecomposer/src/recipient/kwindowpositioner.h similarity index 100%
rename from messagecomposer/src/recipient/kwindowpositioner.h
rename to messagelib/messagecomposer/src/recipient/kwindowpositioner.h
diff --git a/messagecomposer/src/recipient/recipient.cpp \
b/messagelib/messagecomposer/src/recipient/recipient.cpp similarity index 100%
rename from messagecomposer/src/recipient/recipient.cpp
rename to messagelib/messagecomposer/src/recipient/recipient.cpp
diff --git a/messagecomposer/src/recipient/recipient.h \
b/messagelib/messagecomposer/src/recipient/recipient.h similarity index 100%
rename from messagecomposer/src/recipient/recipient.h
rename to messagelib/messagecomposer/src/recipient/recipient.h
diff --git a/messagecomposer/src/recipient/recipientline.cpp \
b/messagelib/messagecomposer/src/recipient/recipientline.cpp similarity index 100%
rename from messagecomposer/src/recipient/recipientline.cpp
rename to messagelib/messagecomposer/src/recipient/recipientline.cpp
diff --git a/messagecomposer/src/recipient/recipientline.h \
b/messagelib/messagecomposer/src/recipient/recipientline.h similarity index 100%
rename from messagecomposer/src/recipient/recipientline.h
rename to messagelib/messagecomposer/src/recipient/recipientline.h
diff --git a/messagecomposer/src/recipient/recipientseditor.cpp \
b/messagelib/messagecomposer/src/recipient/recipientseditor.cpp similarity index 100%
rename from messagecomposer/src/recipient/recipientseditor.cpp
rename to messagelib/messagecomposer/src/recipient/recipientseditor.cpp
diff --git a/messagecomposer/src/recipient/recipientseditor.h \
b/messagelib/messagecomposer/src/recipient/recipientseditor.h similarity index 100%
rename from messagecomposer/src/recipient/recipientseditor.h
rename to messagelib/messagecomposer/src/recipient/recipientseditor.h
diff --git a/messagecomposer/src/recipient/recipientseditorsidewidget.cpp \
b/messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.cpp similarity \
index 100% rename from messagecomposer/src/recipient/recipientseditorsidewidget.cpp
rename to messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.cpp
diff --git a/messagecomposer/src/recipient/recipientseditorsidewidget.h \
b/messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.h similarity \
index 100% rename from messagecomposer/src/recipient/recipientseditorsidewidget.h
rename to messagelib/messagecomposer/src/recipient/recipientseditorsidewidget.h
diff --git a/messagecomposer/src/recipient/recipientspicker.cpp \
b/messagelib/messagecomposer/src/recipient/recipientspicker.cpp similarity index 100%
rename from messagecomposer/src/recipient/recipientspicker.cpp
rename to messagelib/messagecomposer/src/recipient/recipientspicker.cpp
diff --git a/messagecomposer/src/recipient/recipientspicker.h \
b/messagelib/messagecomposer/src/recipient/recipientspicker.h similarity index 100%
rename from messagecomposer/src/recipient/recipientspicker.h
rename to messagelib/messagecomposer/src/recipient/recipientspicker.h
diff --git a/messagecomposer/src/sender/akonadisender.cpp \
b/messagelib/messagecomposer/src/sender/akonadisender.cpp similarity index 100%
rename from messagecomposer/src/sender/akonadisender.cpp
rename to messagelib/messagecomposer/src/sender/akonadisender.cpp
diff --git a/messagecomposer/src/sender/akonadisender.h \
b/messagelib/messagecomposer/src/sender/akonadisender.h similarity index 100%
rename from messagecomposer/src/sender/akonadisender.h
rename to messagelib/messagecomposer/src/sender/akonadisender.h
diff --git a/messagecomposer/src/sender/messagesender.h \
b/messagelib/messagecomposer/src/sender/messagesender.h similarity index 100%
rename from messagecomposer/src/sender/messagesender.h
rename to messagelib/messagecomposer/src/sender/messagesender.h
diff --git a/messagecomposer/src/settings/messagecomposer.kcfg.cmake \
b/messagelib/messagecomposer/src/settings/messagecomposer.kcfg.cmake similarity index \
100% rename from messagecomposer/src/settings/messagecomposer.kcfg.cmake
rename to messagelib/messagecomposer/src/settings/messagecomposer.kcfg.cmake
diff --git a/messagecomposer/src/settings/messagecomposersettings.cpp \
b/messagelib/messagecomposer/src/settings/messagecomposersettings.cpp similarity \
index 100% rename from messagecomposer/src/settings/messagecomposersettings.cpp
rename to messagelib/messagecomposer/src/settings/messagecomposersettings.cpp
diff --git a/messagecomposer/src/settings/messagecomposersettings.h \
b/messagelib/messagecomposer/src/settings/messagecomposersettings.h similarity index \
100% rename from messagecomposer/src/settings/messagecomposersettings.h
rename to messagelib/messagecomposer/src/settings/messagecomposersettings.h
diff --git a/messagecomposer/src/settings/messagecomposersettings_base.kcfgc \
b/messagelib/messagecomposer/src/settings/messagecomposersettings_base.kcfgc \
similarity index 100% rename from \
messagecomposer/src/settings/messagecomposersettings_base.kcfgc rename to \
                messagelib/messagecomposer/src/settings/messagecomposersettings_base.kcfgc
                
diff --git a/messagecomposer/src/utils/kleo_util.h \
b/messagelib/messagecomposer/src/utils/kleo_util.h similarity index 100%
rename from messagecomposer/src/utils/kleo_util.h
rename to messagelib/messagecomposer/src/utils/kleo_util.h
diff --git a/messagecomposer/src/utils/util.cpp \
b/messagelib/messagecomposer/src/utils/util.cpp similarity index 100%
rename from messagecomposer/src/utils/util.cpp
rename to messagelib/messagecomposer/src/utils/util.cpp
diff --git a/messagecomposer/src/utils/util.h \
b/messagelib/messagecomposer/src/utils/util.h similarity index 100%
rename from messagecomposer/src/utils/util.h
rename to messagelib/messagecomposer/src/utils/util.h
diff --git a/messagecomposer/tests/CMakeLists.txt \
b/messagelib/messagecomposer/tests/CMakeLists.txt similarity index 100%
rename from messagecomposer/tests/CMakeLists.txt
rename to messagelib/messagecomposer/tests/CMakeLists.txt
diff --git a/messagecomposer/tests/recipientseditortest.cpp \
b/messagelib/messagecomposer/tests/recipientseditortest.cpp similarity index 100%
rename from messagecomposer/tests/recipientseditortest.cpp
rename to messagelib/messagecomposer/tests/recipientseditortest.cpp
diff --git a/messagecomposer/tests/recipientseditortest.h \
b/messagelib/messagecomposer/tests/recipientseditortest.h similarity index 100%
rename from messagecomposer/tests/recipientseditortest.h
rename to messagelib/messagecomposer/tests/recipientseditortest.h
diff --git a/messagecomposer/tests/testcomposerlineedit.cpp \
b/messagelib/messagecomposer/tests/testcomposerlineedit.cpp similarity index 100%
rename from messagecomposer/tests/testcomposerlineedit.cpp
rename to messagelib/messagecomposer/tests/testcomposerlineedit.cpp
diff --git a/messagecore/.krazy b/messagelib/messagecore/.krazy
similarity index 100%
rename from messagecore/.krazy
rename to messagelib/messagecore/.krazy
diff --git a/messagecore/CMakeLists.txt b/messagelib/messagecore/CMakeLists.txt
similarity index 98%
rename from messagecore/CMakeLists.txt
rename to messagelib/messagecore/CMakeLists.txt
index 5fa0cc6..9139e53 100644
--- a/messagecore/CMakeLists.txt
+++ b/messagelib/messagecore/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(messagecore)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${messagecore_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/messagecore/KF5MessageCoreConfig.cmake.in \
b/messagelib/messagecore/KF5MessageCoreConfig.cmake.in similarity index 100%
rename from messagecore/KF5MessageCoreConfig.cmake.in
rename to messagelib/messagecore/KF5MessageCoreConfig.cmake.in
diff --git a/messagecore/autotests/CMakeLists.txt \
b/messagelib/messagecore/autotests/CMakeLists.txt similarity index 100%
rename from messagecore/autotests/CMakeLists.txt
rename to messagelib/messagecore/autotests/CMakeLists.txt
diff --git a/messagecore/autotests/attachmentcompressjobtest.cpp \
b/messagelib/messagecore/autotests/attachmentcompressjobtest.cpp similarity index \
100% rename from messagecore/autotests/attachmentcompressjobtest.cpp
rename to messagelib/messagecore/autotests/attachmentcompressjobtest.cpp
diff --git a/messagecore/autotests/attachmentcompressjobtest.h \
b/messagelib/messagecore/autotests/attachmentcompressjobtest.h similarity index 100%
rename from messagecore/autotests/attachmentcompressjobtest.h
rename to messagelib/messagecore/autotests/attachmentcompressjobtest.h
diff --git a/messagecore/autotests/attachmentfrommimecontentjobtest.cpp \
b/messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.cpp similarity \
index 100% rename from messagecore/autotests/attachmentfrommimecontentjobtest.cpp
rename to messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.cpp
diff --git a/messagecore/autotests/attachmentfrommimecontentjobtest.h \
b/messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.h similarity \
index 100% rename from messagecore/autotests/attachmentfrommimecontentjobtest.h
rename to messagelib/messagecore/autotests/attachmentfrommimecontentjobtest.h
diff --git a/messagecore/autotests/attachmentfromurljobtest.cpp \
b/messagelib/messagecore/autotests/attachmentfromurljobtest.cpp similarity index 100%
rename from messagecore/autotests/attachmentfromurljobtest.cpp
rename to messagelib/messagecore/autotests/attachmentfromurljobtest.cpp
diff --git a/messagecore/autotests/attachmentfromurljobtest.h \
b/messagelib/messagecore/autotests/attachmentfromurljobtest.h similarity index 100%
rename from messagecore/autotests/attachmentfromurljobtest.h
rename to messagelib/messagecore/autotests/attachmentfromurljobtest.h
diff --git a/messagecore/autotests/attachmentparttest.cpp \
b/messagelib/messagecore/autotests/attachmentparttest.cpp similarity index 100%
rename from messagecore/autotests/attachmentparttest.cpp
rename to messagelib/messagecore/autotests/attachmentparttest.cpp
diff --git a/messagecore/autotests/attachmentparttest.h \
b/messagelib/messagecore/autotests/attachmentparttest.h similarity index 100%
rename from messagecore/autotests/attachmentparttest.h
rename to messagelib/messagecore/autotests/attachmentparttest.h
diff --git a/messagecore/autotests/attachmentpropertiesdialogtest.cpp \
b/messagelib/messagecore/autotests/attachmentpropertiesdialogtest.cpp similarity \
index 100% rename from messagecore/autotests/attachmentpropertiesdialogtest.cpp
rename to messagelib/messagecore/autotests/attachmentpropertiesdialogtest.cpp
diff --git a/messagecore/autotests/attachmentpropertiesdialogtest.h \
b/messagelib/messagecore/autotests/attachmentpropertiesdialogtest.h similarity index \
100% rename from messagecore/autotests/attachmentpropertiesdialogtest.h
rename to messagelib/messagecore/autotests/attachmentpropertiesdialogtest.h
diff --git a/messagecore/autotests/attachments/doc.pdf \
b/messagelib/messagecore/autotests/attachments/doc.pdf similarity index 100%
rename from messagecore/autotests/attachments/doc.pdf
rename to messagelib/messagecore/autotests/attachments/doc.pdf
diff --git a/messagecore/autotests/attachments/file.txt \
b/messagelib/messagecore/autotests/attachments/file.txt similarity index 100%
rename from messagecore/autotests/attachments/file.txt
rename to messagelib/messagecore/autotests/attachments/file.txt
diff --git a/messagecore/autotests/attachments/image.png \
b/messagelib/messagecore/autotests/attachments/image.png similarity index 100%
rename from messagecore/autotests/attachments/image.png
rename to messagelib/messagecore/autotests/attachments/image.png
diff --git a/messagecore/autotests/attachmentupdatejobtest.cpp \
b/messagelib/messagecore/autotests/attachmentupdatejobtest.cpp similarity index 100%
rename from messagecore/autotests/attachmentupdatejobtest.cpp
rename to messagelib/messagecore/autotests/attachmentupdatejobtest.cpp
diff --git a/messagecore/autotests/attachmentupdatejobtest.h \
b/messagelib/messagecore/autotests/attachmentupdatejobtest.h similarity index 100%
rename from messagecore/autotests/attachmentupdatejobtest.h
rename to messagelib/messagecore/autotests/attachmentupdatejobtest.h
diff --git a/messagecore/autotests/gnupg_home/CMakeLists.txt \
b/messagelib/messagecore/autotests/gnupg_home/CMakeLists.txt similarity index 100%
rename from messagecore/autotests/gnupg_home/CMakeLists.txt
rename to messagelib/messagecore/autotests/gnupg_home/CMakeLists.txt
diff --git a/messagecore/autotests/gnupg_home/dirmngr-cache.d/DIR.txt \
b/messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/DIR.txt similarity \
index 100% rename from messagecore/autotests/gnupg_home/dirmngr-cache.d/DIR.txt
rename to messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/DIR.txt
diff --git a/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db \
b/messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
 similarity index 100%
rename from messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
 rename to messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
                
diff --git a/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db \
b/messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
 similarity index 100%
rename from messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
 rename to messagelib/messagecore/autotests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
                
diff --git a/messagecore/autotests/gnupg_home/dirmngr.conf \
b/messagelib/messagecore/autotests/gnupg_home/dirmngr.conf similarity index 100%
rename from messagecore/autotests/gnupg_home/dirmngr.conf
rename to messagelib/messagecore/autotests/gnupg_home/dirmngr.conf
diff --git a/messagecore/autotests/gnupg_home/gpg-agent.conf.in \
b/messagelib/messagecore/autotests/gnupg_home/gpg-agent.conf.in similarity index 100%
rename from messagecore/autotests/gnupg_home/gpg-agent.conf.in
rename to messagelib/messagecore/autotests/gnupg_home/gpg-agent.conf.in
diff --git a/messagecore/autotests/gnupg_home/gpg.conf \
b/messagelib/messagecore/autotests/gnupg_home/gpg.conf similarity index 100%
rename from messagecore/autotests/gnupg_home/gpg.conf
rename to messagelib/messagecore/autotests/gnupg_home/gpg.conf
diff --git a/messagecore/autotests/gnupg_home/gpgsm.conf.in \
b/messagelib/messagecore/autotests/gnupg_home/gpgsm.conf.in similarity index 100%
rename from messagecore/autotests/gnupg_home/gpgsm.conf.in
rename to messagelib/messagecore/autotests/gnupg_home/gpgsm.conf.in
diff --git a/messagecore/autotests/gnupg_home/pinentry-fake.sh \
b/messagelib/messagecore/autotests/gnupg_home/pinentry-fake.sh similarity index 100%
rename from messagecore/autotests/gnupg_home/pinentry-fake.sh
rename to messagelib/messagecore/autotests/gnupg_home/pinentry-fake.sh
diff --git a/messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key \
b/messagelib/messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
 similarity index 100%
rename from messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
 rename to messagelib/messagecore/autotests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
                
diff --git a/messagecore/autotests/gnupg_home/pubring.gpg \
b/messagelib/messagecore/autotests/gnupg_home/pubring.gpg similarity index 100%
rename from messagecore/autotests/gnupg_home/pubring.gpg
rename to messagelib/messagecore/autotests/gnupg_home/pubring.gpg
diff --git a/messagecore/autotests/gnupg_home/pubring.kbx \
b/messagelib/messagecore/autotests/gnupg_home/pubring.kbx similarity index 100%
rename from messagecore/autotests/gnupg_home/pubring.kbx
rename to messagelib/messagecore/autotests/gnupg_home/pubring.kbx
diff --git a/messagecore/autotests/gnupg_home/scdaemon.conf \
b/messagelib/messagecore/autotests/gnupg_home/scdaemon.conf similarity index 100%
rename from messagecore/autotests/gnupg_home/scdaemon.conf
rename to messagelib/messagecore/autotests/gnupg_home/scdaemon.conf
diff --git a/messagecore/autotests/gnupg_home/secring.gpg \
b/messagelib/messagecore/autotests/gnupg_home/secring.gpg similarity index 100%
rename from messagecore/autotests/gnupg_home/secring.gpg
rename to messagelib/messagecore/autotests/gnupg_home/secring.gpg
diff --git a/messagecore/autotests/gnupg_home/trustdb.gpg \
b/messagelib/messagecore/autotests/gnupg_home/trustdb.gpg similarity index 100%
rename from messagecore/autotests/gnupg_home/trustdb.gpg
rename to messagelib/messagecore/autotests/gnupg_home/trustdb.gpg
diff --git a/messagecore/autotests/gnupg_home/trustlist.txt \
b/messagelib/messagecore/autotests/gnupg_home/trustlist.txt similarity index 100%
rename from messagecore/autotests/gnupg_home/trustlist.txt
rename to messagelib/messagecore/autotests/gnupg_home/trustlist.txt
diff --git a/messagecore/autotests/mailinglisttest.cpp \
b/messagelib/messagecore/autotests/mailinglisttest.cpp similarity index 100%
rename from messagecore/autotests/mailinglisttest.cpp
rename to messagelib/messagecore/autotests/mailinglisttest.cpp
diff --git a/messagecore/autotests/mailinglisttest.h \
b/messagelib/messagecore/autotests/mailinglisttest.h similarity index 100%
rename from messagecore/autotests/mailinglisttest.h
rename to messagelib/messagecore/autotests/mailinglisttest.h
diff --git a/messagecore/autotests/qtest_messagecore.h \
b/messagelib/messagecore/autotests/qtest_messagecore.h similarity index 100%
rename from messagecore/autotests/qtest_messagecore.h
rename to messagelib/messagecore/autotests/qtest_messagecore.h
diff --git a/messagecore/autotests/stringutiltest.cpp \
b/messagelib/messagecore/autotests/stringutiltest.cpp similarity index 100%
rename from messagecore/autotests/stringutiltest.cpp
rename to messagelib/messagecore/autotests/stringutiltest.cpp
diff --git a/messagecore/autotests/stringutiltest.h \
b/messagelib/messagecore/autotests/stringutiltest.h similarity index 100%
rename from messagecore/autotests/stringutiltest.h
rename to messagelib/messagecore/autotests/stringutiltest.h
diff --git a/messagecore/src/CMakeLists.txt \
b/messagelib/messagecore/src/CMakeLists.txt similarity index 98%
rename from messagecore/src/CMakeLists.txt
rename to messagelib/messagecore/src/CMakeLists.txt
index 3ee39d3..5c38ffa 100644
--- a/messagecore/src/CMakeLists.txt
+++ b/messagelib/messagecore/src/CMakeLists.txt
@@ -154,7 +154,7 @@ ecm_generate_pri_file(BASE_NAME MessageCore
 )
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${messagecore_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 install(FILES
     ${MessageCore_Camelcasehelpers_HEADERS}
     ${MessageCore_Camelcasesettings_HEADERS}
diff --git a/messagecore/src/Messages.sh b/messagelib/messagecore/src/Messages.sh
similarity index 100%
rename from messagecore/src/Messages.sh
rename to messagelib/messagecore/src/Messages.sh
diff --git a/messagecore/src/README b/messagelib/messagecore/src/README
similarity index 100%
rename from messagecore/src/README
rename to messagelib/messagecore/src/README
diff --git a/messagecore/src/attachment/attachmentcompressjob.cpp \
b/messagelib/messagecore/src/attachment/attachmentcompressjob.cpp similarity index \
100% rename from messagecore/src/attachment/attachmentcompressjob.cpp
rename to messagelib/messagecore/src/attachment/attachmentcompressjob.cpp
diff --git a/messagecore/src/attachment/attachmentcompressjob.h \
b/messagelib/messagecore/src/attachment/attachmentcompressjob.h similarity index 100%
rename from messagecore/src/attachment/attachmentcompressjob.h
rename to messagelib/messagecore/src/attachment/attachmentcompressjob.h
diff --git a/messagecore/src/attachment/attachmentfromfolderjob.cpp \
b/messagelib/messagecore/src/attachment/attachmentfromfolderjob.cpp similarity index \
100% rename from messagecore/src/attachment/attachmentfromfolderjob.cpp
rename to messagelib/messagecore/src/attachment/attachmentfromfolderjob.cpp
diff --git a/messagecore/src/attachment/attachmentfromfolderjob.h \
b/messagelib/messagecore/src/attachment/attachmentfromfolderjob.h similarity index \
100% rename from messagecore/src/attachment/attachmentfromfolderjob.h
rename to messagelib/messagecore/src/attachment/attachmentfromfolderjob.h
diff --git a/messagecore/src/attachment/attachmentfrommimecontentjob.cpp \
b/messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.cpp similarity \
index 100% rename from messagecore/src/attachment/attachmentfrommimecontentjob.cpp
rename to messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.cpp
diff --git a/messagecore/src/attachment/attachmentfrommimecontentjob.h \
b/messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.h similarity \
index 100% rename from messagecore/src/attachment/attachmentfrommimecontentjob.h
rename to messagelib/messagecore/src/attachment/attachmentfrommimecontentjob.h
diff --git a/messagecore/src/attachment/attachmentfromurlbasejob.cpp \
b/messagelib/messagecore/src/attachment/attachmentfromurlbasejob.cpp similarity index \
100% rename from messagecore/src/attachment/attachmentfromurlbasejob.cpp
rename to messagelib/messagecore/src/attachment/attachmentfromurlbasejob.cpp
diff --git a/messagecore/src/attachment/attachmentfromurlbasejob.h \
b/messagelib/messagecore/src/attachment/attachmentfromurlbasejob.h similarity index \
100% rename from messagecore/src/attachment/attachmentfromurlbasejob.h
rename to messagelib/messagecore/src/attachment/attachmentfromurlbasejob.h
diff --git a/messagecore/src/attachment/attachmentfromurljob.cpp \
b/messagelib/messagecore/src/attachment/attachmentfromurljob.cpp similarity index \
100% rename from messagecore/src/attachment/attachmentfromurljob.cpp
rename to messagelib/messagecore/src/attachment/attachmentfromurljob.cpp
diff --git a/messagecore/src/attachment/attachmentfromurljob.h \
b/messagelib/messagecore/src/attachment/attachmentfromurljob.h similarity index 100%
rename from messagecore/src/attachment/attachmentfromurljob.h
rename to messagelib/messagecore/src/attachment/attachmentfromurljob.h
diff --git a/messagecore/src/attachment/attachmentfromurlutils.cpp \
b/messagelib/messagecore/src/attachment/attachmentfromurlutils.cpp similarity index \
100% rename from messagecore/src/attachment/attachmentfromurlutils.cpp
rename to messagelib/messagecore/src/attachment/attachmentfromurlutils.cpp
diff --git a/messagecore/src/attachment/attachmentfromurlutils.h \
b/messagelib/messagecore/src/attachment/attachmentfromurlutils.h similarity index \
100% rename from messagecore/src/attachment/attachmentfromurlutils.h
rename to messagelib/messagecore/src/attachment/attachmentfromurlutils.h
diff --git a/messagecore/src/attachment/attachmentloadjob.cpp \
b/messagelib/messagecore/src/attachment/attachmentloadjob.cpp similarity index 100%
rename from messagecore/src/attachment/attachmentloadjob.cpp
rename to messagelib/messagecore/src/attachment/attachmentloadjob.cpp
diff --git a/messagecore/src/attachment/attachmentloadjob.h \
b/messagelib/messagecore/src/attachment/attachmentloadjob.h similarity index 100%
rename from messagecore/src/attachment/attachmentloadjob.h
rename to messagelib/messagecore/src/attachment/attachmentloadjob.h
diff --git a/messagecore/src/attachment/attachmentpart.cpp \
b/messagelib/messagecore/src/attachment/attachmentpart.cpp similarity index 100%
rename from messagecore/src/attachment/attachmentpart.cpp
rename to messagelib/messagecore/src/attachment/attachmentpart.cpp
diff --git a/messagecore/src/attachment/attachmentpart.h \
b/messagelib/messagecore/src/attachment/attachmentpart.h similarity index 100%
rename from messagecore/src/attachment/attachmentpart.h
rename to messagelib/messagecore/src/attachment/attachmentpart.h
diff --git a/messagecore/src/attachment/attachmentpropertiesdialog.cpp \
b/messagelib/messagecore/src/attachment/attachmentpropertiesdialog.cpp similarity \
index 100% rename from messagecore/src/attachment/attachmentpropertiesdialog.cpp
rename to messagelib/messagecore/src/attachment/attachmentpropertiesdialog.cpp
diff --git a/messagecore/src/attachment/attachmentpropertiesdialog.h \
b/messagelib/messagecore/src/attachment/attachmentpropertiesdialog.h similarity index \
100% rename from messagecore/src/attachment/attachmentpropertiesdialog.h
rename to messagelib/messagecore/src/attachment/attachmentpropertiesdialog.h
diff --git a/messagecore/src/attachment/attachmentupdatejob.cpp \
b/messagelib/messagecore/src/attachment/attachmentupdatejob.cpp similarity index 100%
rename from messagecore/src/attachment/attachmentupdatejob.cpp
rename to messagelib/messagecore/src/attachment/attachmentupdatejob.cpp
diff --git a/messagecore/src/attachment/attachmentupdatejob.h \
b/messagelib/messagecore/src/attachment/attachmentupdatejob.h similarity index 100%
rename from messagecore/src/attachment/attachmentupdatejob.h
rename to messagelib/messagecore/src/attachment/attachmentupdatejob.h
diff --git a/messagecore/src/attachment/ui/attachmentpropertiesdialog.ui \
b/messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog.ui similarity \
index 100% rename from messagecore/src/attachment/ui/attachmentpropertiesdialog.ui
rename to messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog.ui
diff --git a/messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui \
b/messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui \
similarity index 100% rename from \
messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui rename to \
                messagelib/messagecore/src/attachment/ui/attachmentpropertiesdialog_readonly.ui
                
diff --git a/messagecore/src/config-enterprise.h.cmake \
b/messagelib/messagecore/src/config-enterprise.h.cmake similarity index 100%
rename from messagecore/src/config-enterprise.h.cmake
rename to messagelib/messagecore/src/config-enterprise.h.cmake
diff --git a/messagecore/src/helpers/messagehelpers.cpp \
b/messagelib/messagecore/src/helpers/messagehelpers.cpp similarity index 100%
rename from messagecore/src/helpers/messagehelpers.cpp
rename to messagelib/messagecore/src/helpers/messagehelpers.cpp
diff --git a/messagecore/src/helpers/messagehelpers.h \
b/messagelib/messagecore/src/helpers/messagehelpers.h similarity index 100%
rename from messagecore/src/helpers/messagehelpers.h
rename to messagelib/messagecore/src/helpers/messagehelpers.h
diff --git a/messagecore/src/helpers/nodehelper.cpp \
b/messagelib/messagecore/src/helpers/nodehelper.cpp similarity index 100%
rename from messagecore/src/helpers/nodehelper.cpp
rename to messagelib/messagecore/src/helpers/nodehelper.cpp
diff --git a/messagecore/src/helpers/nodehelper.h \
b/messagelib/messagecore/src/helpers/nodehelper.h similarity index 100%
rename from messagecore/src/helpers/nodehelper.h
rename to messagelib/messagecore/src/helpers/nodehelper.h
diff --git a/messagecore/src/messagecoreutil.cpp \
b/messagelib/messagecore/src/messagecoreutil.cpp similarity index 100%
rename from messagecore/src/messagecoreutil.cpp
rename to messagelib/messagecore/src/messagecoreutil.cpp
diff --git a/messagecore/src/messagecoreutil.h \
b/messagelib/messagecore/src/messagecoreutil.h similarity index 100%
rename from messagecore/src/messagecoreutil.h
rename to messagelib/messagecore/src/messagecoreutil.h
diff --git a/messagecore/src/misc/imagecollector.cpp \
b/messagelib/messagecore/src/misc/imagecollector.cpp similarity index 100%
rename from messagecore/src/misc/imagecollector.cpp
rename to messagelib/messagecore/src/misc/imagecollector.cpp
diff --git a/messagecore/src/misc/imagecollector.h \
b/messagelib/messagecore/src/misc/imagecollector.h similarity index 100%
rename from messagecore/src/misc/imagecollector.h
rename to messagelib/messagecore/src/misc/imagecollector.h
diff --git a/messagecore/src/misc/mailinglist.cpp \
b/messagelib/messagecore/src/misc/mailinglist.cpp similarity index 100%
rename from messagecore/src/misc/mailinglist.cpp
rename to messagelib/messagecore/src/misc/mailinglist.cpp
diff --git a/messagecore/src/misc/mailinglist.h \
b/messagelib/messagecore/src/misc/mailinglist.h similarity index 100%
rename from messagecore/src/misc/mailinglist.h
rename to messagelib/messagecore/src/misc/mailinglist.h
diff --git a/messagecore/src/settings/globalsettings_messagecore.kcfgc \
b/messagelib/messagecore/src/settings/globalsettings_messagecore.kcfgc similarity \
index 100% rename from messagecore/src/settings/globalsettings_messagecore.kcfgc
rename to messagelib/messagecore/src/settings/globalsettings_messagecore.kcfgc
diff --git a/messagecore/src/settings/messagecore.kcfg \
b/messagelib/messagecore/src/settings/messagecore.kcfg similarity index 100%
rename from messagecore/src/settings/messagecore.kcfg
rename to messagelib/messagecore/src/settings/messagecore.kcfg
diff --git a/messagecore/src/settings/messagecoresettings.cpp \
b/messagelib/messagecore/src/settings/messagecoresettings.cpp similarity index 100%
rename from messagecore/src/settings/messagecoresettings.cpp
rename to messagelib/messagecore/src/settings/messagecoresettings.cpp
diff --git a/messagecore/src/settings/messagecoresettings.h \
b/messagelib/messagecore/src/settings/messagecoresettings.h similarity index 100%
rename from messagecore/src/settings/messagecoresettings.h
rename to messagelib/messagecore/src/settings/messagecoresettings.h
diff --git a/messagecore/src/utils/stringutil.cpp \
b/messagelib/messagecore/src/utils/stringutil.cpp similarity index 100%
rename from messagecore/src/utils/stringutil.cpp
rename to messagelib/messagecore/src/utils/stringutil.cpp
diff --git a/messagecore/src/utils/stringutil.h \
b/messagelib/messagecore/src/utils/stringutil.h similarity index 100%
rename from messagecore/src/utils/stringutil.h
rename to messagelib/messagecore/src/utils/stringutil.h
diff --git a/messagelist/.krazy b/messagelib/messagelist/.krazy
similarity index 100%
rename from messagelist/.krazy
rename to messagelib/messagelist/.krazy
diff --git a/messagelist/CMakeLists.txt b/messagelib/messagelist/CMakeLists.txt
similarity index 96%
rename from messagelist/CMakeLists.txt
rename to messagelib/messagelist/CMakeLists.txt
index eb6a859..0fd0375 100644
--- a/messagelist/CMakeLists.txt
+++ b/messagelib/messagelist/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
 project(MessageList)
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${MessageList_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -36,7 +36,6 @@ find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG \
REQUIRED)  find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiSearch "5.0.42" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search \
libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search \
                capabilities in KMail and Akonadi")
diff --git a/messagelist/KF5MessageListConfig.cmake.in \
b/messagelib/messagelist/KF5MessageListConfig.cmake.in similarity index 100%
rename from messagelist/KF5MessageListConfig.cmake.in
rename to messagelib/messagelist/KF5MessageListConfig.cmake.in
diff --git a/messagelist/autotests/CMakeLists.txt \
b/messagelib/messagelist/autotests/CMakeLists.txt similarity index 100%
rename from messagelist/autotests/CMakeLists.txt
rename to messagelib/messagelist/autotests/CMakeLists.txt
diff --git a/messagelist/autotests/itemsizetest.cpp \
b/messagelib/messagelist/autotests/itemsizetest.cpp similarity index 100%
rename from messagelist/autotests/itemsizetest.cpp
rename to messagelib/messagelist/autotests/itemsizetest.cpp
diff --git a/messagelist/autotests/quicksearchlinetest.cpp \
b/messagelib/messagelist/autotests/quicksearchlinetest.cpp similarity index 100%
rename from messagelist/autotests/quicksearchlinetest.cpp
rename to messagelib/messagelist/autotests/quicksearchlinetest.cpp
diff --git a/messagelist/autotests/quicksearchlinetest.h \
b/messagelib/messagelist/autotests/quicksearchlinetest.h similarity index 100%
rename from messagelist/autotests/quicksearchlinetest.h
rename to messagelib/messagelist/autotests/quicksearchlinetest.h
diff --git a/messagelist/autotests/quicksearchwarningtest.cpp \
b/messagelib/messagelist/autotests/quicksearchwarningtest.cpp similarity index 100%
rename from messagelist/autotests/quicksearchwarningtest.cpp
rename to messagelib/messagelist/autotests/quicksearchwarningtest.cpp
diff --git a/messagelist/autotests/quicksearchwarningtest.h \
b/messagelib/messagelist/autotests/quicksearchwarningtest.h similarity index 100%
rename from messagelist/autotests/quicksearchwarningtest.h
rename to messagelib/messagelist/autotests/quicksearchwarningtest.h
diff --git a/messagelist/src/CMakeLists.txt \
b/messagelib/messagelist/src/CMakeLists.txt similarity index 98%
rename from messagelist/src/CMakeLists.txt
rename to messagelib/messagelist/src/CMakeLists.txt
index 6c7b14a..fd5dd1f 100644
--- a/messagelist/src/CMakeLists.txt
+++ b/messagelib/messagelist/src/CMakeLists.txt
@@ -133,7 +133,7 @@ ecm_generate_pri_file(BASE_NAME MessageList
     DEPS "AkonadiCore AkonadiMime Mime" FILENAME_VAR PRI_FILENAME \
INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/MessageList  )
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${MessageList_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 install(FILES
     ${MessageList_Camelcasewidgets_HEADERS}
     ${MessageList_CamelCase_HEADERS}
diff --git a/messagelist/src/Mainpage.dox b/messagelib/messagelist/src/Mainpage.dox
similarity index 100%
rename from messagelist/src/Mainpage.dox
rename to messagelib/messagelist/src/Mainpage.dox
diff --git a/messagelist/src/Messages.sh b/messagelib/messagelist/src/Messages.sh
similarity index 100%
rename from messagelist/src/Messages.sh
rename to messagelib/messagelist/src/Messages.sh
diff --git a/messagelist/src/config-messagelist.h.cmake \
b/messagelib/messagelist/src/config-messagelist.h.cmake similarity index 100%
rename from messagelist/src/config-messagelist.h.cmake
rename to messagelib/messagelist/src/config-messagelist.h.cmake
diff --git a/messagelist/src/core/aggregation.cpp \
b/messagelib/messagelist/src/core/aggregation.cpp similarity index 100%
rename from messagelist/src/core/aggregation.cpp
rename to messagelib/messagelist/src/core/aggregation.cpp
diff --git a/messagelist/src/core/aggregation.h \
b/messagelib/messagelist/src/core/aggregation.h similarity index 100%
rename from messagelist/src/core/aggregation.h
rename to messagelib/messagelist/src/core/aggregation.h
diff --git a/messagelist/src/core/delegate.cpp \
b/messagelib/messagelist/src/core/delegate.cpp similarity index 100%
rename from messagelist/src/core/delegate.cpp
rename to messagelib/messagelist/src/core/delegate.cpp
diff --git a/messagelist/src/core/delegate.h \
b/messagelib/messagelist/src/core/delegate.h similarity index 100%
rename from messagelist/src/core/delegate.h
rename to messagelib/messagelist/src/core/delegate.h
diff --git a/messagelist/src/core/enums.h b/messagelib/messagelist/src/core/enums.h
similarity index 100%
rename from messagelist/src/core/enums.h
rename to messagelib/messagelist/src/core/enums.h
diff --git a/messagelist/src/core/filter.cpp \
b/messagelib/messagelist/src/core/filter.cpp similarity index 100%
rename from messagelist/src/core/filter.cpp
rename to messagelib/messagelist/src/core/filter.cpp
diff --git a/messagelist/src/core/filter.h b/messagelib/messagelist/src/core/filter.h
similarity index 100%
rename from messagelist/src/core/filter.h
rename to messagelib/messagelist/src/core/filter.h
diff --git a/messagelist/src/core/groupheaderitem.cpp \
b/messagelib/messagelist/src/core/groupheaderitem.cpp similarity index 100%
rename from messagelist/src/core/groupheaderitem.cpp
rename to messagelib/messagelist/src/core/groupheaderitem.cpp
diff --git a/messagelist/src/core/groupheaderitem.h \
b/messagelib/messagelist/src/core/groupheaderitem.h similarity index 100%
rename from messagelist/src/core/groupheaderitem.h
rename to messagelib/messagelist/src/core/groupheaderitem.h
diff --git a/messagelist/src/core/item.cpp b/messagelib/messagelist/src/core/item.cpp
similarity index 100%
rename from messagelist/src/core/item.cpp
rename to messagelib/messagelist/src/core/item.cpp
diff --git a/messagelist/src/core/item.h b/messagelib/messagelist/src/core/item.h
similarity index 100%
rename from messagelist/src/core/item.h
rename to messagelib/messagelist/src/core/item.h
diff --git a/messagelist/src/core/item_p.h b/messagelib/messagelist/src/core/item_p.h
similarity index 100%
rename from messagelist/src/core/item_p.h
rename to messagelib/messagelist/src/core/item_p.h
diff --git a/messagelist/src/core/manager.cpp \
b/messagelib/messagelist/src/core/manager.cpp similarity index 100%
rename from messagelist/src/core/manager.cpp
rename to messagelib/messagelist/src/core/manager.cpp
diff --git a/messagelist/src/core/manager.h \
b/messagelib/messagelist/src/core/manager.h similarity index 100%
rename from messagelist/src/core/manager.h
rename to messagelib/messagelist/src/core/manager.h
diff --git a/messagelist/src/core/messageitem.cpp \
b/messagelib/messagelist/src/core/messageitem.cpp similarity index 100%
rename from messagelist/src/core/messageitem.cpp
rename to messagelib/messagelist/src/core/messageitem.cpp
diff --git a/messagelist/src/core/messageitem.h \
b/messagelib/messagelist/src/core/messageitem.h similarity index 100%
rename from messagelist/src/core/messageitem.h
rename to messagelib/messagelist/src/core/messageitem.h
diff --git a/messagelist/src/core/messageitem_p.h \
b/messagelib/messagelist/src/core/messageitem_p.h similarity index 100%
rename from messagelist/src/core/messageitem_p.h
rename to messagelib/messagelist/src/core/messageitem_p.h
diff --git a/messagelist/src/core/messageitemsetmanager.cpp \
b/messagelib/messagelist/src/core/messageitemsetmanager.cpp similarity index 100%
rename from messagelist/src/core/messageitemsetmanager.cpp
rename to messagelib/messagelist/src/core/messageitemsetmanager.cpp
diff --git a/messagelist/src/core/messageitemsetmanager.h \
b/messagelib/messagelist/src/core/messageitemsetmanager.h similarity index 100%
rename from messagelist/src/core/messageitemsetmanager.h
rename to messagelib/messagelist/src/core/messageitemsetmanager.h
diff --git a/messagelist/src/core/messagelistsettings.kcfgc \
b/messagelib/messagelist/src/core/messagelistsettings.kcfgc similarity index 100%
rename from messagelist/src/core/messagelistsettings.kcfgc
rename to messagelib/messagelist/src/core/messagelistsettings.kcfgc
diff --git a/messagelist/src/core/model.cpp \
b/messagelib/messagelist/src/core/model.cpp similarity index 100%
rename from messagelist/src/core/model.cpp
rename to messagelib/messagelist/src/core/model.cpp
diff --git a/messagelist/src/core/model.h b/messagelib/messagelist/src/core/model.h
similarity index 100%
rename from messagelist/src/core/model.h
rename to messagelib/messagelist/src/core/model.h
diff --git a/messagelist/src/core/model_p.h \
b/messagelib/messagelist/src/core/model_p.h similarity index 100%
rename from messagelist/src/core/model_p.h
rename to messagelib/messagelist/src/core/model_p.h
diff --git a/messagelist/src/core/modelinvariantindex.cpp \
b/messagelib/messagelist/src/core/modelinvariantindex.cpp similarity index 100%
rename from messagelist/src/core/modelinvariantindex.cpp
rename to messagelib/messagelist/src/core/modelinvariantindex.cpp
diff --git a/messagelist/src/core/modelinvariantindex.h \
b/messagelib/messagelist/src/core/modelinvariantindex.h similarity index 100%
rename from messagelist/src/core/modelinvariantindex.h
rename to messagelib/messagelist/src/core/modelinvariantindex.h
diff --git a/messagelist/src/core/modelinvariantindex_p.h \
b/messagelib/messagelist/src/core/modelinvariantindex_p.h similarity index 100%
rename from messagelist/src/core/modelinvariantindex_p.h
rename to messagelib/messagelist/src/core/modelinvariantindex_p.h
diff --git a/messagelist/src/core/modelinvariantrowmapper.cpp \
b/messagelib/messagelist/src/core/modelinvariantrowmapper.cpp similarity index 100%
rename from messagelist/src/core/modelinvariantrowmapper.cpp
rename to messagelib/messagelist/src/core/modelinvariantrowmapper.cpp
diff --git a/messagelist/src/core/modelinvariantrowmapper.h \
b/messagelib/messagelist/src/core/modelinvariantrowmapper.h similarity index 100%
rename from messagelist/src/core/modelinvariantrowmapper.h
rename to messagelib/messagelist/src/core/modelinvariantrowmapper.h
diff --git a/messagelist/src/core/modelinvariantrowmapper_p.h \
b/messagelib/messagelist/src/core/modelinvariantrowmapper_p.h similarity index 100%
rename from messagelist/src/core/modelinvariantrowmapper_p.h
rename to messagelib/messagelist/src/core/modelinvariantrowmapper_p.h
diff --git a/messagelist/src/core/optionset.cpp \
b/messagelib/messagelist/src/core/optionset.cpp similarity index 100%
rename from messagelist/src/core/optionset.cpp
rename to messagelib/messagelist/src/core/optionset.cpp
diff --git a/messagelist/src/core/optionset.h \
b/messagelib/messagelist/src/core/optionset.h similarity index 100%
rename from messagelist/src/core/optionset.h
rename to messagelib/messagelist/src/core/optionset.h
diff --git a/messagelist/src/core/settings.kcfg \
b/messagelib/messagelist/src/core/settings.kcfg similarity index 100%
rename from messagelist/src/core/settings.kcfg
rename to messagelib/messagelist/src/core/settings.kcfg
diff --git a/messagelist/src/core/sortorder.cpp \
b/messagelib/messagelist/src/core/sortorder.cpp similarity index 100%
rename from messagelist/src/core/sortorder.cpp
rename to messagelib/messagelist/src/core/sortorder.cpp
diff --git a/messagelist/src/core/sortorder.h \
b/messagelib/messagelist/src/core/sortorder.h similarity index 100%
rename from messagelist/src/core/sortorder.h
rename to messagelib/messagelist/src/core/sortorder.h
diff --git a/messagelist/src/core/storagemodelbase.cpp \
b/messagelib/messagelist/src/core/storagemodelbase.cpp similarity index 100%
rename from messagelist/src/core/storagemodelbase.cpp
rename to messagelib/messagelist/src/core/storagemodelbase.cpp
diff --git a/messagelist/src/core/storagemodelbase.h \
b/messagelib/messagelist/src/core/storagemodelbase.h similarity index 100%
rename from messagelist/src/core/storagemodelbase.h
rename to messagelib/messagelist/src/core/storagemodelbase.h
diff --git a/messagelist/src/core/theme.cpp \
b/messagelib/messagelist/src/core/theme.cpp similarity index 100%
rename from messagelist/src/core/theme.cpp
rename to messagelib/messagelist/src/core/theme.cpp
diff --git a/messagelist/src/core/theme.h b/messagelib/messagelist/src/core/theme.h
similarity index 100%
rename from messagelist/src/core/theme.h
rename to messagelib/messagelist/src/core/theme.h
diff --git a/messagelist/src/core/themedelegate.cpp \
b/messagelib/messagelist/src/core/themedelegate.cpp similarity index 100%
rename from messagelist/src/core/themedelegate.cpp
rename to messagelib/messagelist/src/core/themedelegate.cpp
diff --git a/messagelist/src/core/themedelegate.h \
b/messagelib/messagelist/src/core/themedelegate.h similarity index 100%
rename from messagelist/src/core/themedelegate.h
rename to messagelib/messagelist/src/core/themedelegate.h
diff --git a/messagelist/src/core/view.cpp b/messagelib/messagelist/src/core/view.cpp
similarity index 100%
rename from messagelist/src/core/view.cpp
rename to messagelib/messagelist/src/core/view.cpp
diff --git a/messagelist/src/core/view.h b/messagelib/messagelist/src/core/view.h
similarity index 100%
rename from messagelist/src/core/view.h
rename to messagelib/messagelist/src/core/view.h
diff --git a/messagelist/src/core/widgetbase.cpp \
b/messagelib/messagelist/src/core/widgetbase.cpp similarity index 100%
rename from messagelist/src/core/widgetbase.cpp
rename to messagelib/messagelist/src/core/widgetbase.cpp
diff --git a/messagelist/src/core/widgetbase.h \
b/messagelib/messagelist/src/core/widgetbase.h similarity index 100%
rename from messagelist/src/core/widgetbase.h
rename to messagelib/messagelist/src/core/widgetbase.h
diff --git a/messagelist/src/core/widgets/quicksearchline.cpp \
b/messagelib/messagelist/src/core/widgets/quicksearchline.cpp similarity index 100%
rename from messagelist/src/core/widgets/quicksearchline.cpp
rename to messagelib/messagelist/src/core/widgets/quicksearchline.cpp
diff --git a/messagelist/src/core/widgets/quicksearchline.h \
b/messagelib/messagelist/src/core/widgets/quicksearchline.h similarity index 100%
rename from messagelist/src/core/widgets/quicksearchline.h
rename to messagelib/messagelist/src/core/widgets/quicksearchline.h
diff --git a/messagelist/src/core/widgets/quicksearchwarning.cpp \
b/messagelib/messagelist/src/core/widgets/quicksearchwarning.cpp similarity index \
100% rename from messagelist/src/core/widgets/quicksearchwarning.cpp
rename to messagelib/messagelist/src/core/widgets/quicksearchwarning.cpp
diff --git a/messagelist/src/core/widgets/quicksearchwarning.h \
b/messagelib/messagelist/src/core/widgets/quicksearchwarning.h similarity index 100%
rename from messagelist/src/core/widgets/quicksearchwarning.h
rename to messagelib/messagelist/src/core/widgets/quicksearchwarning.h
diff --git a/messagelist/src/messagelistutil.cpp \
b/messagelib/messagelist/src/messagelistutil.cpp similarity index 100%
rename from messagelist/src/messagelistutil.cpp
rename to messagelib/messagelist/src/messagelistutil.cpp
diff --git a/messagelist/src/messagelistutil.h \
b/messagelib/messagelist/src/messagelistutil.h similarity index 100%
rename from messagelist/src/messagelistutil.h
rename to messagelib/messagelist/src/messagelistutil.h
diff --git a/messagelist/src/pane.cpp b/messagelib/messagelist/src/pane.cpp
similarity index 100%
rename from messagelist/src/pane.cpp
rename to messagelib/messagelist/src/pane.cpp
diff --git a/messagelist/src/pane.h b/messagelib/messagelist/src/pane.h
similarity index 100%
rename from messagelist/src/pane.h
rename to messagelib/messagelist/src/pane.h
diff --git a/messagelist/src/pics/CMakeLists.txt \
b/messagelib/messagelist/src/pics/CMakeLists.txt similarity index 100%
rename from messagelist/src/pics/CMakeLists.txt
rename to messagelib/messagelist/src/pics/CMakeLists.txt
diff --git a/messagelist/src/pics/mail-deleted.png \
b/messagelib/messagelist/src/pics/mail-deleted.png similarity index 100%
rename from messagelist/src/pics/mail-deleted.png
rename to messagelib/messagelist/src/pics/mail-deleted.png
diff --git a/messagelist/src/pics/mail-horizontal-space.png \
b/messagelib/messagelist/src/pics/mail-horizontal-space.png similarity index 100%
rename from messagelist/src/pics/mail-horizontal-space.png
rename to messagelib/messagelist/src/pics/mail-horizontal-space.png
diff --git a/messagelist/src/pics/mail-thread-ignored.png \
b/messagelib/messagelist/src/pics/mail-thread-ignored.png similarity index 100%
rename from messagelist/src/pics/mail-thread-ignored.png
rename to messagelib/messagelist/src/pics/mail-thread-ignored.png
diff --git a/messagelist/src/pics/mail-thread-watch.png \
b/messagelib/messagelist/src/pics/mail-thread-watch.png similarity index 100%
rename from messagelist/src/pics/mail-thread-watch.png
rename to messagelib/messagelist/src/pics/mail-thread-watch.png
diff --git a/messagelist/src/pics/mail-vertical-separator-line.png \
b/messagelib/messagelist/src/pics/mail-vertical-separator-line.png similarity index \
100% rename from messagelist/src/pics/mail-vertical-separator-line.png
rename to messagelib/messagelist/src/pics/mail-vertical-separator-line.png
diff --git a/messagelist/src/storagemodel.cpp \
b/messagelib/messagelist/src/storagemodel.cpp similarity index 100%
rename from messagelist/src/storagemodel.cpp
rename to messagelib/messagelist/src/storagemodel.cpp
diff --git a/messagelist/src/storagemodel.h \
b/messagelib/messagelist/src/storagemodel.h similarity index 100%
rename from messagelist/src/storagemodel.h
rename to messagelib/messagelist/src/storagemodel.h
diff --git a/messagelist/src/utils/aggregationcombobox.cpp \
b/messagelib/messagelist/src/utils/aggregationcombobox.cpp similarity index 100%
rename from messagelist/src/utils/aggregationcombobox.cpp
rename to messagelib/messagelist/src/utils/aggregationcombobox.cpp
diff --git a/messagelist/src/utils/aggregationcombobox.h \
b/messagelib/messagelist/src/utils/aggregationcombobox.h similarity index 100%
rename from messagelist/src/utils/aggregationcombobox.h
rename to messagelib/messagelist/src/utils/aggregationcombobox.h
diff --git a/messagelist/src/utils/aggregationcombobox_p.h \
b/messagelib/messagelist/src/utils/aggregationcombobox_p.h similarity index 100%
rename from messagelist/src/utils/aggregationcombobox_p.h
rename to messagelib/messagelist/src/utils/aggregationcombobox_p.h
diff --git a/messagelist/src/utils/aggregationconfigbutton.cpp \
b/messagelib/messagelist/src/utils/aggregationconfigbutton.cpp similarity index 100%
rename from messagelist/src/utils/aggregationconfigbutton.cpp
rename to messagelib/messagelist/src/utils/aggregationconfigbutton.cpp
diff --git a/messagelist/src/utils/aggregationconfigbutton.h \
b/messagelib/messagelist/src/utils/aggregationconfigbutton.h similarity index 100%
rename from messagelist/src/utils/aggregationconfigbutton.h
rename to messagelib/messagelist/src/utils/aggregationconfigbutton.h
diff --git a/messagelist/src/utils/aggregationeditor.cpp \
b/messagelib/messagelist/src/utils/aggregationeditor.cpp similarity index 100%
rename from messagelist/src/utils/aggregationeditor.cpp
rename to messagelib/messagelist/src/utils/aggregationeditor.cpp
diff --git a/messagelist/src/utils/aggregationeditor.h \
b/messagelib/messagelist/src/utils/aggregationeditor.h similarity index 100%
rename from messagelist/src/utils/aggregationeditor.h
rename to messagelib/messagelist/src/utils/aggregationeditor.h
diff --git a/messagelist/src/utils/comboboxutils.cpp \
b/messagelib/messagelist/src/utils/comboboxutils.cpp similarity index 100%
rename from messagelist/src/utils/comboboxutils.cpp
rename to messagelib/messagelist/src/utils/comboboxutils.cpp
diff --git a/messagelist/src/utils/comboboxutils.h \
b/messagelib/messagelist/src/utils/comboboxutils.h similarity index 100%
rename from messagelist/src/utils/comboboxutils.h
rename to messagelib/messagelist/src/utils/comboboxutils.h
diff --git a/messagelist/src/utils/configureaggregationsdialog.cpp \
b/messagelib/messagelist/src/utils/configureaggregationsdialog.cpp similarity index \
100% rename from messagelist/src/utils/configureaggregationsdialog.cpp
rename to messagelib/messagelist/src/utils/configureaggregationsdialog.cpp
diff --git a/messagelist/src/utils/configureaggregationsdialog.h \
b/messagelib/messagelist/src/utils/configureaggregationsdialog.h similarity index \
100% rename from messagelist/src/utils/configureaggregationsdialog.h
rename to messagelib/messagelist/src/utils/configureaggregationsdialog.h
diff --git a/messagelist/src/utils/configureaggregationsdialog_p.h \
b/messagelib/messagelist/src/utils/configureaggregationsdialog_p.h similarity index \
100% rename from messagelist/src/utils/configureaggregationsdialog_p.h
rename to messagelib/messagelist/src/utils/configureaggregationsdialog_p.h
diff --git a/messagelist/src/utils/configurethemesdialog.cpp \
b/messagelib/messagelist/src/utils/configurethemesdialog.cpp similarity index 100%
rename from messagelist/src/utils/configurethemesdialog.cpp
rename to messagelib/messagelist/src/utils/configurethemesdialog.cpp
diff --git a/messagelist/src/utils/configurethemesdialog.h \
b/messagelib/messagelist/src/utils/configurethemesdialog.h similarity index 100%
rename from messagelist/src/utils/configurethemesdialog.h
rename to messagelib/messagelist/src/utils/configurethemesdialog.h
diff --git a/messagelist/src/utils/configurethemesdialog_p.h \
b/messagelib/messagelist/src/utils/configurethemesdialog_p.h similarity index 100%
rename from messagelist/src/utils/configurethemesdialog_p.h
rename to messagelib/messagelist/src/utils/configurethemesdialog_p.h
diff --git a/messagelist/src/utils/optionseteditor.cpp \
b/messagelib/messagelist/src/utils/optionseteditor.cpp similarity index 100%
rename from messagelist/src/utils/optionseteditor.cpp
rename to messagelib/messagelist/src/utils/optionseteditor.cpp
diff --git a/messagelist/src/utils/optionseteditor.h \
b/messagelib/messagelist/src/utils/optionseteditor.h similarity index 100%
rename from messagelist/src/utils/optionseteditor.h
rename to messagelib/messagelist/src/utils/optionseteditor.h
diff --git a/messagelist/src/utils/themecombobox.cpp \
b/messagelib/messagelist/src/utils/themecombobox.cpp similarity index 100%
rename from messagelist/src/utils/themecombobox.cpp
rename to messagelib/messagelist/src/utils/themecombobox.cpp
diff --git a/messagelist/src/utils/themecombobox.h \
b/messagelib/messagelist/src/utils/themecombobox.h similarity index 100%
rename from messagelist/src/utils/themecombobox.h
rename to messagelib/messagelist/src/utils/themecombobox.h
diff --git a/messagelist/src/utils/themecombobox_p.h \
b/messagelib/messagelist/src/utils/themecombobox_p.h similarity index 100%
rename from messagelist/src/utils/themecombobox_p.h
rename to messagelib/messagelist/src/utils/themecombobox_p.h
diff --git a/messagelist/src/utils/themeconfigbutton.cpp \
b/messagelib/messagelist/src/utils/themeconfigbutton.cpp similarity index 100%
rename from messagelist/src/utils/themeconfigbutton.cpp
rename to messagelib/messagelist/src/utils/themeconfigbutton.cpp
diff --git a/messagelist/src/utils/themeconfigbutton.h \
b/messagelib/messagelist/src/utils/themeconfigbutton.h similarity index 100%
rename from messagelist/src/utils/themeconfigbutton.h
rename to messagelib/messagelist/src/utils/themeconfigbutton.h
diff --git a/messagelist/src/utils/themeeditor.cpp \
b/messagelib/messagelist/src/utils/themeeditor.cpp similarity index 100%
rename from messagelist/src/utils/themeeditor.cpp
rename to messagelib/messagelist/src/utils/themeeditor.cpp
diff --git a/messagelist/src/utils/themeeditor.h \
b/messagelib/messagelist/src/utils/themeeditor.h similarity index 100%
rename from messagelist/src/utils/themeeditor.h
rename to messagelib/messagelist/src/utils/themeeditor.h
diff --git a/messagelist/src/widget.cpp b/messagelib/messagelist/src/widget.cpp
similarity index 100%
rename from messagelist/src/widget.cpp
rename to messagelib/messagelist/src/widget.cpp
diff --git a/messagelist/src/widget.h b/messagelib/messagelist/src/widget.h
similarity index 100%
rename from messagelist/src/widget.h
rename to messagelib/messagelist/src/widget.h
diff --git a/messageviewer/.krazy b/messagelib/messageviewer/.krazy
similarity index 100%
rename from messageviewer/.krazy
rename to messagelib/messageviewer/.krazy
diff --git a/messageviewer/CMakeLists.txt b/messagelib/messageviewer/CMakeLists.txt
similarity index 96%
rename from messageviewer/CMakeLists.txt
rename to messagelib/messageviewer/CMakeLists.txt
index 258c639..187b15d 100644
--- a/messageviewer/CMakeLists.txt
+++ b/messagelib/messageviewer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(MessageViewer)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${MessageViewer_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${MessageViewer_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
@@ -33,6 +33,7 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.1.42")
 
 find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools \
WebKitWidgets) +find_package(KF5WebKit ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
@@ -42,7 +43,6 @@ find_package(KF5GrantleeTheme ${KDEPIM_LIB_VERSION} CONFIG \
REQUIRED)  find_package(KF5Libkleo ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IncidenceEditorsng ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
diff --git a/messageviewer/KF5MessageViewerConfig.cmake.in \
b/messagelib/messageviewer/KF5MessageViewerConfig.cmake.in similarity index 100%
rename from messageviewer/KF5MessageViewerConfig.cmake.in
rename to messagelib/messageviewer/KF5MessageViewerConfig.cmake.in
diff --git a/messageviewer/autotests/CMakeLists.txt \
b/messagelib/messageviewer/autotests/CMakeLists.txt similarity index 100%
rename from messageviewer/autotests/CMakeLists.txt
rename to messagelib/messageviewer/autotests/CMakeLists.txt
diff --git a/messageviewer/autotests/attachmenttest.cpp \
b/messagelib/messageviewer/autotests/attachmenttest.cpp similarity index 100%
rename from messageviewer/autotests/attachmenttest.cpp
rename to messagelib/messageviewer/autotests/attachmenttest.cpp
diff --git a/messageviewer/autotests/converthtmltoplaintexttest.cpp \
b/messagelib/messageviewer/autotests/converthtmltoplaintexttest.cpp similarity index \
100% rename from messageviewer/autotests/converthtmltoplaintexttest.cpp
rename to messagelib/messageviewer/autotests/converthtmltoplaintexttest.cpp
diff --git a/messageviewer/autotests/converthtmltoplaintexttest.h \
b/messagelib/messageviewer/autotests/converthtmltoplaintexttest.h similarity index \
100% rename from messageviewer/autotests/converthtmltoplaintexttest.h
rename to messagelib/messageviewer/autotests/converthtmltoplaintexttest.h
diff --git a/messageviewer/autotests/cryptohelpertest.cpp \
b/messagelib/messageviewer/autotests/cryptohelpertest.cpp similarity index 100%
rename from messageviewer/autotests/cryptohelpertest.cpp
rename to messagelib/messageviewer/autotests/cryptohelpertest.cpp
diff --git a/messageviewer/autotests/cryptohelpertest.h \
b/messagelib/messageviewer/autotests/cryptohelpertest.h similarity index 100%
rename from messageviewer/autotests/cryptohelpertest.h
rename to messagelib/messageviewer/autotests/cryptohelpertest.h
diff --git a/messageviewer/autotests/data/encapsulated-with-attachment.mbox \
b/messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/encapsulated-with-attachment.mbox rename to \
                messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox
                
diff --git a/messageviewer/autotests/data/encapsulated-with-attachment.mbox.html \
b/messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/encapsulated-with-attachment.mbox.html rename to \
                messagelib/messageviewer/autotests/data/encapsulated-with-attachment.mbox.html
                
diff --git a/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox rename to \
                messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox
                
diff --git a/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html rename to \
                messagelib/messageviewer/autotests/data/forward-openpgp-signed-encrypted.mbox.html
                
diff --git a/messageviewer/autotests/data/html.mbox \
b/messagelib/messageviewer/autotests/data/html.mbox similarity index 100%
rename from messageviewer/autotests/data/html.mbox
rename to messagelib/messageviewer/autotests/data/html.mbox
diff --git a/messageviewer/autotests/data/html.mbox.html \
b/messagelib/messageviewer/autotests/data/html.mbox.html similarity index 100%
rename from messageviewer/autotests/data/html.mbox.html
rename to messagelib/messageviewer/autotests/data/html.mbox.html
diff --git a/messageviewer/autotests/data/htmlonly.mbox \
b/messagelib/messageviewer/autotests/data/htmlonly.mbox similarity index 100%
rename from messageviewer/autotests/data/htmlonly.mbox
rename to messagelib/messageviewer/autotests/data/htmlonly.mbox
diff --git a/messageviewer/autotests/data/htmlonly.mbox.html \
b/messagelib/messageviewer/autotests/data/htmlonly.mbox.html similarity index 100%
rename from messageviewer/autotests/data/htmlonly.mbox.html
rename to messagelib/messageviewer/autotests/data/htmlonly.mbox.html
diff --git a/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox \
b/messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox similarity \
index 100% rename from messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox
rename to messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox
diff --git a/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html \
b/messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html rename to \
                messagelib/messageviewer/autotests/data/inlinepgpencrypted-appendix.mbox.html
                
diff --git a/messageviewer/autotests/data/inlinepgpencrypted.mbox \
b/messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox similarity index \
100% rename from messageviewer/autotests/data/inlinepgpencrypted.mbox
rename to messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox
diff --git a/messageviewer/autotests/data/inlinepgpencrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/inlinepgpencrypted.mbox.html
rename to messagelib/messageviewer/autotests/data/inlinepgpencrypted.mbox.html
diff --git a/messageviewer/autotests/data/no-content-type.mbox \
b/messagelib/messageviewer/autotests/data/no-content-type.mbox similarity index 100%
rename from messageviewer/autotests/data/no-content-type.mbox
rename to messagelib/messageviewer/autotests/data/no-content-type.mbox
diff --git a/messageviewer/autotests/data/no-content-type.mbox.html \
b/messagelib/messageviewer/autotests/data/no-content-type.mbox.html similarity index \
100% rename from messageviewer/autotests/data/no-content-type.mbox.html
rename to messagelib/messageviewer/autotests/data/no-content-type.mbox.html
diff --git a/messageviewer/autotests/data/openpgp-encrypted+signed.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox similarity \
index 100% rename from messageviewer/autotests/data/openpgp-encrypted+signed.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox
diff --git a/messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted+signed.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-attachment.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-attachment.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-noData.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox similarity \
index 100% rename from messageviewer/autotests/data/openpgp-encrypted-noData.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox
diff --git a/messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-noData.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-encrypted-two-attachments.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox similarity index \
100% rename from messageviewer/autotests/data/openpgp-encrypted.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox
diff --git a/messageviewer/autotests/data/openpgp-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/openpgp-encrypted.mbox.html
rename to messagelib/messageviewer/autotests/data/openpgp-encrypted.mbox.html
diff --git a/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-inline-charset-encrypted.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-inline-signed-broken.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-inline-signed-broken.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-inline-signed-broken.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-inline-signed-broken.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-inline-signed.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-inline-signed.mbox similarity index \
100% rename from messageviewer/autotests/data/openpgp-inline-signed.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-inline-signed.mbox
diff --git a/messageviewer/autotests/data/openpgp-inline-signed.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-inline-signed.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/openpgp-inline-signed.mbox.html
rename to messagelib/messageviewer/autotests/data/openpgp-inline-signed.mbox.html
diff --git a/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
 rename to messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox similarity \
index 100% rename from messageviewer/autotests/data/openpgp-signed-encrypted.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox
diff --git a/messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-encrypted.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
 rename to messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
 rename to messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox similarity \
index 100% rename from messageviewer/autotests/data/openpgp-signed-mailinglist.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox
diff --git a/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-mailinglist.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox similarity \
index 100% rename from messageviewer/autotests/data/openpgp-signed-no-protocol.mbox
rename to messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox
diff --git a/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-no-protocol.mbox.html
                
diff --git a/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox \
b/messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-two-attachments.mbox rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox
                
diff --git a/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html \
b/messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html rename to \
                messagelib/messageviewer/autotests/data/openpgp-signed-two-attachments.mbox.html
                
diff --git a/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
 similarity index 100%
rename from messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
rename to messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
                
diff --git a/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
 similarity index 100%
rename from messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
 rename to messagelib/messageviewer/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
                
diff --git a/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox \
b/messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox \
similarity index 100% rename from \
messageviewer/autotests/data/smime-encrypted-octet-stream.mbox rename to \
                messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox
                
diff --git a/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html \
b/messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html \
similarity index 100% rename from \
messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html rename to \
                messagelib/messageviewer/autotests/data/smime-encrypted-octet-stream.mbox.html
                
diff --git a/messageviewer/autotests/data/smime-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/smime-encrypted.mbox similarity index 100%
rename from messageviewer/autotests/data/smime-encrypted.mbox
rename to messagelib/messageviewer/autotests/data/smime-encrypted.mbox
diff --git a/messageviewer/autotests/data/smime-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/smime-encrypted.mbox.html similarity index \
100% rename from messageviewer/autotests/data/smime-encrypted.mbox.html
rename to messagelib/messageviewer/autotests/data/smime-encrypted.mbox.html
diff --git a/messageviewer/autotests/data/smime-opaque-enc+sign.mbox \
b/messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox similarity index \
100% rename from messageviewer/autotests/data/smime-opaque-enc+sign.mbox
rename to messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox
diff --git a/messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html \
b/messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html
rename to messagelib/messageviewer/autotests/data/smime-opaque-enc+sign.mbox.html
diff --git a/messageviewer/autotests/data/smime-opaque-sign.mbox \
b/messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox similarity index \
100% rename from messageviewer/autotests/data/smime-opaque-sign.mbox
rename to messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox
diff --git a/messageviewer/autotests/data/smime-opaque-sign.mbox.html \
b/messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/smime-opaque-sign.mbox.html
rename to messagelib/messageviewer/autotests/data/smime-opaque-sign.mbox.html
diff --git a/messageviewer/autotests/data/smime-signed-encrypted.mbox \
b/messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox similarity \
index 100% rename from messageviewer/autotests/data/smime-signed-encrypted.mbox
rename to messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox
diff --git a/messageviewer/autotests/data/smime-signed-encrypted.mbox.html \
b/messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/smime-signed-encrypted.mbox.html
rename to messagelib/messageviewer/autotests/data/smime-signed-encrypted.mbox.html
diff --git a/messageviewer/autotests/data/text+html-maillinglist.mbox \
b/messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox similarity \
index 100% rename from messageviewer/autotests/data/text+html-maillinglist.mbox
rename to messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox
diff --git a/messageviewer/autotests/data/text+html-maillinglist.mbox.html \
b/messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox.html similarity \
index 100% rename from messageviewer/autotests/data/text+html-maillinglist.mbox.html
rename to messagelib/messageviewer/autotests/data/text+html-maillinglist.mbox.html
diff --git a/messageviewer/autotests/data/tnef-one-file.mbox \
b/messagelib/messageviewer/autotests/data/tnef-one-file.mbox similarity index 100%
rename from messageviewer/autotests/data/tnef-one-file.mbox
rename to messagelib/messageviewer/autotests/data/tnef-one-file.mbox
diff --git a/messageviewer/autotests/data/tnef-one-file.mbox.html \
b/messagelib/messageviewer/autotests/data/tnef-one-file.mbox.html similarity index \
100% rename from messageviewer/autotests/data/tnef-one-file.mbox.html
rename to messagelib/messageviewer/autotests/data/tnef-one-file.mbox.html
diff --git a/messageviewer/autotests/data/tnef-two-files.mbox \
b/messagelib/messageviewer/autotests/data/tnef-two-files.mbox similarity index 100%
rename from messageviewer/autotests/data/tnef-two-files.mbox
rename to messagelib/messageviewer/autotests/data/tnef-two-files.mbox
diff --git a/messageviewer/autotests/data/tnef-two-files.mbox.html \
b/messagelib/messageviewer/autotests/data/tnef-two-files.mbox.html similarity index \
100% rename from messageviewer/autotests/data/tnef-two-files.mbox.html
rename to messagelib/messageviewer/autotests/data/tnef-two-files.mbox.html
diff --git a/messageviewer/autotests/htmlquotecolorertest.cpp \
b/messagelib/messageviewer/autotests/htmlquotecolorertest.cpp similarity index 100%
rename from messageviewer/autotests/htmlquotecolorertest.cpp
rename to messagelib/messageviewer/autotests/htmlquotecolorertest.cpp
diff --git a/messageviewer/autotests/htmlquotecolorertest.h \
b/messagelib/messageviewer/autotests/htmlquotecolorertest.h similarity index 100%
rename from messageviewer/autotests/htmlquotecolorertest.h
rename to messagelib/messageviewer/autotests/htmlquotecolorertest.h
diff --git a/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp \
b/messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp \
similarity index 100% rename from \
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp rename to \
                messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp
                
diff --git a/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h \
b/messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h similarity \
index 100% rename from messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
rename to messagelib/messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
diff --git a/messageviewer/autotests/messagedisplayformatattributetest.cpp \
b/messagelib/messageviewer/autotests/messagedisplayformatattributetest.cpp similarity \
index 100% rename from messageviewer/autotests/messagedisplayformatattributetest.cpp
rename to messagelib/messageviewer/autotests/messagedisplayformatattributetest.cpp
diff --git a/messageviewer/autotests/messagedisplayformatattributetest.h \
b/messagelib/messageviewer/autotests/messagedisplayformatattributetest.h similarity \
index 100% rename from messageviewer/autotests/messagedisplayformatattributetest.h
rename to messagelib/messageviewer/autotests/messagedisplayformatattributetest.h
diff --git a/messageviewer/autotests/nodehelpertest.cpp \
b/messagelib/messageviewer/autotests/nodehelpertest.cpp similarity index 100%
rename from messageviewer/autotests/nodehelpertest.cpp
rename to messagelib/messageviewer/autotests/nodehelpertest.cpp
diff --git a/messageviewer/autotests/nodehelpertest.h \
b/messagelib/messageviewer/autotests/nodehelpertest.h similarity index 100%
rename from messageviewer/autotests/nodehelpertest.h
rename to messagelib/messageviewer/autotests/nodehelpertest.h
diff --git a/messageviewer/autotests/objecttreeparsertest.cpp \
b/messagelib/messageviewer/autotests/objecttreeparsertest.cpp similarity index 100%
rename from messageviewer/autotests/objecttreeparsertest.cpp
rename to messagelib/messageviewer/autotests/objecttreeparsertest.cpp
diff --git a/messageviewer/autotests/objecttreeparsertest.h \
b/messagelib/messageviewer/autotests/objecttreeparsertest.h similarity index 100%
rename from messageviewer/autotests/objecttreeparsertest.h
rename to messagelib/messageviewer/autotests/objecttreeparsertest.h
diff --git a/messageviewer/autotests/rendertest.cpp \
b/messagelib/messageviewer/autotests/rendertest.cpp similarity index 100%
rename from messageviewer/autotests/rendertest.cpp
rename to messagelib/messageviewer/autotests/rendertest.cpp
diff --git a/messageviewer/autotests/setupenv.cpp \
b/messagelib/messageviewer/autotests/setupenv.cpp similarity index 100%
rename from messageviewer/autotests/setupenv.cpp
rename to messagelib/messageviewer/autotests/setupenv.cpp
diff --git a/messageviewer/autotests/setupenv.h \
b/messagelib/messageviewer/autotests/setupenv.h similarity index 100%
rename from messageviewer/autotests/setupenv.h
rename to messagelib/messageviewer/autotests/setupenv.h
diff --git a/messageviewer/autotests/testcsshelper.cpp \
b/messagelib/messageviewer/autotests/testcsshelper.cpp similarity index 100%
rename from messageviewer/autotests/testcsshelper.cpp
rename to messagelib/messageviewer/autotests/testcsshelper.cpp
diff --git a/messageviewer/autotests/testcsshelper.h \
b/messagelib/messageviewer/autotests/testcsshelper.h similarity index 100%
rename from messageviewer/autotests/testcsshelper.h
rename to messagelib/messageviewer/autotests/testcsshelper.h
diff --git a/messageviewer/autotests/unencryptedmessagetest.cpp \
b/messagelib/messageviewer/autotests/unencryptedmessagetest.cpp similarity index 100%
rename from messageviewer/autotests/unencryptedmessagetest.cpp
rename to messagelib/messageviewer/autotests/unencryptedmessagetest.cpp
diff --git a/messageviewer/autotests/unittestenv/config-sqlite-db.xml \
b/messagelib/messageviewer/autotests/unittestenv/config-sqlite-db.xml similarity \
index 100% rename from messageviewer/autotests/unittestenv/config-sqlite-db.xml
rename to messagelib/messageviewer/autotests/unittestenv/config-sqlite-db.xml
diff --git a/messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc \
b/messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
 similarity index 100%
rename from messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
 rename to messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
                
diff --git a/messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc \
b/messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc \
similarity index 100% rename from \
messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc rename to \
                messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdebugrc
                
diff --git a/messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc \
b/messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc \
similarity index 100% rename from \
messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc rename to \
                messagelib/messageviewer/autotests/unittestenv/kdehome/share/config/kdedrc
                
diff --git a/messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc \
b/messagelib/messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
 similarity index 100%
rename from messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
 rename to messagelib/messageviewer/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
                
diff --git a/messageviewer/autotests/util.cpp \
b/messagelib/messageviewer/autotests/util.cpp similarity index 100%
rename from messageviewer/autotests/util.cpp
rename to messagelib/messageviewer/autotests/util.cpp
diff --git a/messageviewer/autotests/util.h \
b/messagelib/messageviewer/autotests/util.h similarity index 100%
rename from messageviewer/autotests/util.h
rename to messagelib/messageviewer/autotests/util.h
diff --git a/messageviewer/autotests/viewertest.cpp \
b/messagelib/messageviewer/autotests/viewertest.cpp similarity index 100%
rename from messageviewer/autotests/viewertest.cpp
rename to messagelib/messageviewer/autotests/viewertest.cpp
diff --git a/messageviewer/autotests/viewertest.h \
b/messagelib/messageviewer/autotests/viewertest.h similarity index 100%
rename from messageviewer/autotests/viewertest.h
rename to messagelib/messageviewer/autotests/viewertest.h
diff --git a/messageviewer/autotests/zoomactionmenutest.cpp \
b/messagelib/messageviewer/autotests/zoomactionmenutest.cpp similarity index 100%
rename from messageviewer/autotests/zoomactionmenutest.cpp
rename to messagelib/messageviewer/autotests/zoomactionmenutest.cpp
diff --git a/messageviewer/autotests/zoomactionmenutest.h \
b/messagelib/messageviewer/autotests/zoomactionmenutest.h similarity index 100%
rename from messageviewer/autotests/zoomactionmenutest.h
rename to messagelib/messageviewer/autotests/zoomactionmenutest.h
diff --git a/messageviewer/cmake/modules/FindGpgme.cmake \
b/messagelib/messageviewer/cmake/modules/FindGpgme.cmake similarity index 100%
rename from messageviewer/cmake/modules/FindGpgme.cmake
rename to messagelib/messageviewer/cmake/modules/FindGpgme.cmake
diff --git a/templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake \
b/messagelib/messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake similarity \
index 100% rename from templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake
rename to messagelib/messageviewer/cmake/modules/kdepim_add_gpg_crypto_test.cmake
diff --git a/templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
b/messagelib/messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
similarity index 100% rename from \
templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake rename to \
                messagelib/messageviewer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake
                
diff --git a/messageviewer/src/CMakeLists.txt \
b/messagelib/messageviewer/src/CMakeLists.txt similarity index 99%
rename from messageviewer/src/CMakeLists.txt
rename to messagelib/messageviewer/src/CMakeLists.txt
index ffe76da..29da57c 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messagelib/messageviewer/src/CMakeLists.txt
@@ -377,7 +377,7 @@ ecm_generate_pri_file(BASE_NAME MessageViewer
     DEPS "PimCommon MessageCore AkonadiCore AkonadiMime Contacts Libkleo" \
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR \
${KDE_INSTALL_INCLUDEDIR_KF5}/MessageViewer  )
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${MessageViewer_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 install(FILES
     ${MessageViewer_Camelcaseheader_HEADERS}
     ${MessageViewer_Camelcaseviewerplugin_HEADERS}
diff --git a/messageviewer/src/Mainpage.dox \
b/messagelib/messageviewer/src/Mainpage.dox similarity index 100%
rename from messageviewer/src/Mainpage.dox
rename to messagelib/messageviewer/src/Mainpage.dox
diff --git a/messageviewer/src/Messages.sh b/messagelib/messageviewer/src/Messages.sh
similarity index 100%
rename from messageviewer/src/Messages.sh
rename to messagelib/messageviewer/src/Messages.sh
diff --git a/messageviewer/src/TODO b/messagelib/messageviewer/src/TODO
similarity index 100%
rename from messageviewer/src/TODO
rename to messagelib/messageviewer/src/TODO
diff --git a/messageviewer/src/about/CMakeLists.txt \
b/messagelib/messageviewer/src/about/CMakeLists.txt similarity index 100%
rename from messageviewer/src/about/CMakeLists.txt
rename to messagelib/messageviewer/src/about/CMakeLists.txt
diff --git a/messageviewer/src/about/default/CMakeLists.txt \
b/messagelib/messageviewer/src/about/default/CMakeLists.txt similarity index 100%
rename from messageviewer/src/about/default/CMakeLists.txt
rename to messagelib/messageviewer/src/about/default/CMakeLists.txt
diff --git a/messageviewer/src/about/default/background.png \
b/messagelib/messageviewer/src/about/default/background.png similarity index 100%
rename from messageviewer/src/about/default/background.png
rename to messagelib/messageviewer/src/about/default/background.png
diff --git a/messageviewer/src/about/default/main.css \
b/messagelib/messageviewer/src/about/default/main.css similarity index 100%
rename from messageviewer/src/about/default/main.css
rename to messagelib/messageviewer/src/about/default/main.css
diff --git a/messageviewer/src/about/default/main.html \
b/messagelib/messageviewer/src/about/default/main.html similarity index 100%
rename from messageviewer/src/about/default/main.html
rename to messagelib/messageviewer/src/about/default/main.html
diff --git a/messageviewer/src/about/default/splash.theme \
b/messagelib/messageviewer/src/about/default/splash.theme similarity index 100%
rename from messageviewer/src/about/default/splash.theme
rename to messagelib/messageviewer/src/about/default/splash.theme
diff --git a/messageviewer/src/about/default/status.html \
b/messagelib/messageviewer/src/about/default/status.html similarity index 100%
rename from messageviewer/src/about/default/status.html
rename to messagelib/messageviewer/src/about/default/status.html
diff --git a/messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp \
b/messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp similarity \
index 100% rename from messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp
rename to messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.cpp
diff --git a/messageviewer/src/adblock/adblockaddsubscriptiondialog.h \
b/messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.h similarity \
index 100% rename from messageviewer/src/adblock/adblockaddsubscriptiondialog.h
rename to messagelib/messageviewer/src/adblock/adblockaddsubscriptiondialog.h
diff --git a/messageviewer/src/adblock/adblockblockableitemsdialog.cpp \
b/messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.cpp similarity \
index 100% rename from messageviewer/src/adblock/adblockblockableitemsdialog.cpp
rename to messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.cpp
diff --git a/messageviewer/src/adblock/adblockblockableitemsdialog.h \
b/messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.h similarity index \
100% rename from messageviewer/src/adblock/adblockblockableitemsdialog.h
rename to messagelib/messageviewer/src/adblock/adblockblockableitemsdialog.h
diff --git a/messageviewer/src/adblock/adblockblockableitemswidget.cpp \
b/messagelib/messageviewer/src/adblock/adblockblockableitemswidget.cpp similarity \
index 100% rename from messageviewer/src/adblock/adblockblockableitemswidget.cpp
rename to messagelib/messageviewer/src/adblock/adblockblockableitemswidget.cpp
diff --git a/messageviewer/src/adblock/adblockblockableitemswidget.h \
b/messagelib/messageviewer/src/adblock/adblockblockableitemswidget.h similarity index \
100% rename from messageviewer/src/adblock/adblockblockableitemswidget.h
rename to messagelib/messageviewer/src/adblock/adblockblockableitemswidget.h
diff --git a/messageviewer/src/adblock/adblockcreatefilterdialog.cpp \
b/messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.cpp similarity index \
100% rename from messageviewer/src/adblock/adblockcreatefilterdialog.cpp
rename to messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.cpp
diff --git a/messageviewer/src/adblock/adblockcreatefilterdialog.h \
b/messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.h similarity index \
100% rename from messageviewer/src/adblock/adblockcreatefilterdialog.h
rename to messagelib/messageviewer/src/adblock/adblockcreatefilterdialog.h
diff --git a/messageviewer/src/adblock/adblockelementhiding.cpp \
b/messagelib/messageviewer/src/adblock/adblockelementhiding.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockelementhiding.cpp
rename to messagelib/messageviewer/src/adblock/adblockelementhiding.cpp
diff --git a/messageviewer/src/adblock/adblockelementhiding.h \
b/messagelib/messageviewer/src/adblock/adblockelementhiding.h similarity index 100%
rename from messageviewer/src/adblock/adblockelementhiding.h
rename to messagelib/messageviewer/src/adblock/adblockelementhiding.h
diff --git a/messageviewer/src/adblock/adblockhostmatcher.cpp \
b/messagelib/messageviewer/src/adblock/adblockhostmatcher.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockhostmatcher.cpp
rename to messagelib/messageviewer/src/adblock/adblockhostmatcher.cpp
diff --git a/messageviewer/src/adblock/adblockhostmatcher.h \
b/messagelib/messageviewer/src/adblock/adblockhostmatcher.h similarity index 100%
rename from messageviewer/src/adblock/adblockhostmatcher.h
rename to messagelib/messageviewer/src/adblock/adblockhostmatcher.h
diff --git a/messageviewer/src/adblock/adblocklistwidget.cpp \
b/messagelib/messageviewer/src/adblock/adblocklistwidget.cpp similarity index 100%
rename from messageviewer/src/adblock/adblocklistwidget.cpp
rename to messagelib/messageviewer/src/adblock/adblocklistwidget.cpp
diff --git a/messageviewer/src/adblock/adblocklistwidget.h \
b/messagelib/messageviewer/src/adblock/adblocklistwidget.h similarity index 100%
rename from messageviewer/src/adblock/adblocklistwidget.h
rename to messagelib/messageviewer/src/adblock/adblocklistwidget.h
diff --git a/messageviewer/src/adblock/adblockmanager.cpp \
b/messagelib/messageviewer/src/adblock/adblockmanager.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockmanager.cpp
rename to messagelib/messageviewer/src/adblock/adblockmanager.cpp
diff --git a/messageviewer/src/adblock/adblockmanager.h \
b/messagelib/messageviewer/src/adblock/adblockmanager.h similarity index 100%
rename from messageviewer/src/adblock/adblockmanager.h
rename to messagelib/messageviewer/src/adblock/adblockmanager.h
diff --git a/messageviewer/src/adblock/adblockrule.cpp \
b/messagelib/messageviewer/src/adblock/adblockrule.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockrule.cpp
rename to messagelib/messageviewer/src/adblock/adblockrule.cpp
diff --git a/messageviewer/src/adblock/adblockrule.h \
b/messagelib/messageviewer/src/adblock/adblockrule.h similarity index 100%
rename from messageviewer/src/adblock/adblockrule.h
rename to messagelib/messageviewer/src/adblock/adblockrule.h
diff --git a/messageviewer/src/adblock/adblockrulefallbackimpl.cpp \
b/messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.cpp similarity index \
100% rename from messageviewer/src/adblock/adblockrulefallbackimpl.cpp
rename to messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.cpp
diff --git a/messageviewer/src/adblock/adblockrulefallbackimpl.h \
b/messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.h similarity index \
100% rename from messageviewer/src/adblock/adblockrulefallbackimpl.h
rename to messagelib/messageviewer/src/adblock/adblockrulefallbackimpl.h
diff --git a/messageviewer/src/adblock/adblockruleimpl.h \
b/messagelib/messageviewer/src/adblock/adblockruleimpl.h similarity index 100%
rename from messageviewer/src/adblock/adblockruleimpl.h
rename to messagelib/messageviewer/src/adblock/adblockruleimpl.h
diff --git a/messageviewer/src/adblock/adblockrulenullimpl.cpp \
b/messagelib/messageviewer/src/adblock/adblockrulenullimpl.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockrulenullimpl.cpp
rename to messagelib/messageviewer/src/adblock/adblockrulenullimpl.cpp
diff --git a/messageviewer/src/adblock/adblockrulenullimpl.h \
b/messagelib/messageviewer/src/adblock/adblockrulenullimpl.h similarity index 100%
rename from messageviewer/src/adblock/adblockrulenullimpl.h
rename to messagelib/messageviewer/src/adblock/adblockrulenullimpl.h
diff --git a/messageviewer/src/adblock/adblockruletextmatchimpl.cpp \
b/messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.cpp similarity index \
100% rename from messageviewer/src/adblock/adblockruletextmatchimpl.cpp
rename to messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.cpp
diff --git a/messageviewer/src/adblock/adblockruletextmatchimpl.h \
b/messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.h similarity index \
100% rename from messageviewer/src/adblock/adblockruletextmatchimpl.h
rename to messagelib/messageviewer/src/adblock/adblockruletextmatchimpl.h
diff --git a/messageviewer/src/adblock/adblocksettingwidget.cpp \
b/messagelib/messageviewer/src/adblock/adblocksettingwidget.cpp similarity index 100%
rename from messageviewer/src/adblock/adblocksettingwidget.cpp
rename to messagelib/messageviewer/src/adblock/adblocksettingwidget.cpp
diff --git a/messageviewer/src/adblock/adblocksettingwidget.h \
b/messagelib/messageviewer/src/adblock/adblocksettingwidget.h similarity index 100%
rename from messageviewer/src/adblock/adblocksettingwidget.h
rename to messagelib/messageviewer/src/adblock/adblocksettingwidget.h
diff --git a/messageviewer/src/adblock/adblockshowlistdialog.cpp \
b/messagelib/messageviewer/src/adblock/adblockshowlistdialog.cpp similarity index \
100% rename from messageviewer/src/adblock/adblockshowlistdialog.cpp
rename to messagelib/messageviewer/src/adblock/adblockshowlistdialog.cpp
diff --git a/messageviewer/src/adblock/adblockshowlistdialog.h \
b/messagelib/messageviewer/src/adblock/adblockshowlistdialog.h similarity index 100%
rename from messageviewer/src/adblock/adblockshowlistdialog.h
rename to messagelib/messageviewer/src/adblock/adblockshowlistdialog.h
diff --git a/messageviewer/src/adblock/adblocksyntaxhighlighter.cpp \
b/messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.cpp similarity index \
100% rename from messageviewer/src/adblock/adblocksyntaxhighlighter.cpp
rename to messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.cpp
diff --git a/messageviewer/src/adblock/adblocksyntaxhighlighter.h \
b/messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.h similarity index \
100% rename from messageviewer/src/adblock/adblocksyntaxhighlighter.h
rename to messagelib/messageviewer/src/adblock/adblocksyntaxhighlighter.h
diff --git a/messageviewer/src/adblock/adblockutil.cpp \
b/messagelib/messageviewer/src/adblock/adblockutil.cpp similarity index 100%
rename from messageviewer/src/adblock/adblockutil.cpp
rename to messagelib/messageviewer/src/adblock/adblockutil.cpp
diff --git a/messageviewer/src/adblock/adblockutil.h \
b/messagelib/messageviewer/src/adblock/adblockutil.h similarity index 100%
rename from messageviewer/src/adblock/adblockutil.h
rename to messagelib/messageviewer/src/adblock/adblockutil.h
diff --git a/messageviewer/src/adblock/networkaccessmanager.cpp \
b/messagelib/messageviewer/src/adblock/networkaccessmanager.cpp similarity index 100%
rename from messageviewer/src/adblock/networkaccessmanager.cpp
rename to messagelib/messageviewer/src/adblock/networkaccessmanager.cpp
diff --git a/messageviewer/src/adblock/networkaccessmanager.h \
b/messagelib/messageviewer/src/adblock/networkaccessmanager.h similarity index 100%
rename from messageviewer/src/adblock/networkaccessmanager.h
rename to messagelib/messageviewer/src/adblock/networkaccessmanager.h
diff --git a/messageviewer/src/adblock/tests/CMakeLists.txt \
b/messagelib/messageviewer/src/adblock/tests/CMakeLists.txt similarity index 100%
rename from messageviewer/src/adblock/tests/CMakeLists.txt
rename to messagelib/messageviewer/src/adblock/tests/CMakeLists.txt
diff --git a/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp \
b/messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp \
similarity index 100% rename from \
messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp rename to \
                messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp
                
diff --git a/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h \
b/messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h \
similarity index 100% rename from \
messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h rename to \
                messagelib/messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.h
                
diff --git a/messageviewer/src/adblock/tests/adblocksettings_gui.cpp \
b/messagelib/messageviewer/src/adblock/tests/adblocksettings_gui.cpp similarity index \
100% rename from messageviewer/src/adblock/tests/adblocksettings_gui.cpp
rename to messagelib/messageviewer/src/adblock/tests/adblocksettings_gui.cpp
diff --git a/messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp \
b/messagelib/messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp similarity \
index 100% rename from messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp
rename to messagelib/messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp
diff --git a/messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui \
b/messagelib/messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui similarity \
index 100% rename from messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui
rename to messagelib/messageviewer/src/adblock/ui/adblockcreatefilterwidget.ui
diff --git a/messageviewer/src/adblock/ui/settings_adblock.ui \
b/messagelib/messageviewer/src/adblock/ui/settings_adblock.ui similarity index 100%
rename from messageviewer/src/adblock/ui/settings_adblock.ui
rename to messagelib/messageviewer/src/adblock/ui/settings_adblock.ui
diff --git a/messageviewer/src/adblock/webpage.cpp \
b/messagelib/messageviewer/src/adblock/webpage.cpp similarity index 100%
rename from messageviewer/src/adblock/webpage.cpp
rename to messagelib/messageviewer/src/adblock/webpage.cpp
diff --git a/messageviewer/src/adblock/webpage.h \
b/messagelib/messageviewer/src/adblock/webpage.h similarity index 100%
rename from messageviewer/src/adblock/webpage.h
rename to messagelib/messageviewer/src/adblock/webpage.h
diff --git a/messageviewer/src/antispam/antispamconfig.cpp \
b/messagelib/messageviewer/src/antispam/antispamconfig.cpp similarity index 100%
rename from messageviewer/src/antispam/antispamconfig.cpp
rename to messagelib/messageviewer/src/antispam/antispamconfig.cpp
diff --git a/messageviewer/src/antispam/antispamconfig.h \
b/messagelib/messageviewer/src/antispam/antispamconfig.h similarity index 100%
rename from messageviewer/src/antispam/antispamconfig.h
rename to messagelib/messageviewer/src/antispam/antispamconfig.h
diff --git a/messageviewer/src/antispam/spamheaderanalyzer.cpp \
b/messagelib/messageviewer/src/antispam/spamheaderanalyzer.cpp similarity index 100%
rename from messageviewer/src/antispam/spamheaderanalyzer.cpp
rename to messagelib/messageviewer/src/antispam/spamheaderanalyzer.cpp
diff --git a/messageviewer/src/antispam/spamheaderanalyzer.h \
b/messagelib/messageviewer/src/antispam/spamheaderanalyzer.h similarity index 100%
rename from messageviewer/src/antispam/spamheaderanalyzer.h
rename to messagelib/messageviewer/src/antispam/spamheaderanalyzer.h
diff --git a/messageviewer/src/config-messageviewer.h.cmake \
b/messagelib/messageviewer/src/config-messageviewer.h.cmake similarity index 100%
rename from messageviewer/src/config-messageviewer.h.cmake
rename to messagelib/messageviewer/src/config-messageviewer.h.cmake
diff --git a/messageviewer/src/findbar/autotests/CMakeLists.txt \
b/messagelib/messageviewer/src/findbar/autotests/CMakeLists.txt similarity index 100%
rename from messageviewer/src/findbar/autotests/CMakeLists.txt
rename to messagelib/messageviewer/src/findbar/autotests/CMakeLists.txt
diff --git a/messageviewer/src/findbar/autotests/findbarbasetest.cpp \
b/messagelib/messageviewer/src/findbar/autotests/findbarbasetest.cpp similarity index \
100% rename from messageviewer/src/findbar/autotests/findbarbasetest.cpp
rename to messagelib/messageviewer/src/findbar/autotests/findbarbasetest.cpp
diff --git a/messageviewer/src/findbar/autotests/findbarbasetest.h \
b/messagelib/messageviewer/src/findbar/autotests/findbarbasetest.h similarity index \
100% rename from messageviewer/src/findbar/autotests/findbarbasetest.h
rename to messagelib/messageviewer/src/findbar/autotests/findbarbasetest.h
diff --git a/messageviewer/src/findbar/findbarbase.cpp \
b/messagelib/messageviewer/src/findbar/findbarbase.cpp similarity index 100%
rename from messageviewer/src/findbar/findbarbase.cpp
rename to messagelib/messageviewer/src/findbar/findbarbase.cpp
diff --git a/messageviewer/src/findbar/findbarbase.h \
b/messagelib/messageviewer/src/findbar/findbarbase.h similarity index 100%
rename from messageviewer/src/findbar/findbarbase.h
rename to messagelib/messageviewer/src/findbar/findbarbase.h
diff --git a/messageviewer/src/findbar/findbarmailwebview.cpp \
b/messagelib/messageviewer/src/findbar/findbarmailwebview.cpp similarity index 100%
rename from messageviewer/src/findbar/findbarmailwebview.cpp
rename to messagelib/messageviewer/src/findbar/findbarmailwebview.cpp
diff --git a/messageviewer/src/findbar/findbarmailwebview.h \
b/messagelib/messageviewer/src/findbar/findbarmailwebview.h similarity index 100%
rename from messageviewer/src/findbar/findbarmailwebview.h
rename to messagelib/messageviewer/src/findbar/findbarmailwebview.h
diff --git a/messageviewer/src/findbar/findbarsourceview.cpp \
b/messagelib/messageviewer/src/findbar/findbarsourceview.cpp similarity index 100%
rename from messageviewer/src/findbar/findbarsourceview.cpp
rename to messagelib/messageviewer/src/findbar/findbarsourceview.cpp
diff --git a/messageviewer/src/findbar/findbarsourceview.h \
b/messagelib/messageviewer/src/findbar/findbarsourceview.h similarity index 100%
rename from messageviewer/src/findbar/findbarsourceview.h
rename to messagelib/messageviewer/src/findbar/findbarsourceview.h
diff --git a/messageviewer/src/grantleefilters/CMakeLists.txt \
b/messagelib/messageviewer/src/grantleefilters/CMakeLists.txt similarity index 100%
rename from messageviewer/src/grantleefilters/CMakeLists.txt
rename to messagelib/messageviewer/src/grantleefilters/CMakeLists.txt
diff --git a/messageviewer/src/grantleefilters/messageheaderfilter.cpp \
b/messagelib/messageviewer/src/grantleefilters/messageheaderfilter.cpp similarity \
index 100% rename from messageviewer/src/grantleefilters/messageheaderfilter.cpp
rename to messagelib/messageviewer/src/grantleefilters/messageheaderfilter.cpp
diff --git a/messageviewer/src/grantleefilters/messageheaderfilter.h \
b/messagelib/messageviewer/src/grantleefilters/messageheaderfilter.h similarity index \
100% rename from messageviewer/src/grantleefilters/messageheaderfilter.h
rename to messagelib/messageviewer/src/grantleefilters/messageheaderfilter.h
diff --git a/messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp \
b/messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp \
similarity index 100% rename from \
messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp rename to \
                messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.cpp
                
diff --git a/messageviewer/src/grantleefilters/messageheadergrantleefilters.h \
b/messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.h \
similarity index 100% rename from \
messageviewer/src/grantleefilters/messageheadergrantleefilters.h rename to \
                messagelib/messageviewer/src/grantleefilters/messageheadergrantleefilters.h
                
diff --git a/messageviewer/src/header/CMakeLists.txt \
b/messagelib/messageviewer/src/header/CMakeLists.txt similarity index 100%
rename from messageviewer/src/header/CMakeLists.txt
rename to messagelib/messageviewer/src/header/CMakeLists.txt
diff --git a/messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt similarity \
index 100% rename from messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt
rename to messagelib/messageviewer/src/header/allheaderstyleplugin/CMakeLists.txt
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp \
similarity index 100% rename from \
messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp rename to \
                messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.cpp
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h \
similarity index 100% rename from \
messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h rename to \
                messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstrategy.h
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp
rename to messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h \
similarity index 100% rename from \
messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h rename to \
                messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp \
similarity index 100% rename from \
messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp rename to \
                messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h \
similarity index 100% rename from \
messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h rename to \
                messagelib/messageviewer/src/header/allheaderstyleplugin/allheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/allheaderstyleplugin/messageviewer_allheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/autotests/CMakeLists.txt \
b/messagelib/messageviewer/src/header/autotests/CMakeLists.txt similarity index 100%
rename from messageviewer/src/header/autotests/CMakeLists.txt
rename to messagelib/messageviewer/src/header/autotests/CMakeLists.txt
diff --git a/messageviewer/src/header/autotests/allheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/allheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/allheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.h similarity \
index 100% rename from messageviewer/src/header/autotests/allheaderstyleplugintest.h
rename to messagelib/messageviewer/src/header/autotests/allheaderstyleplugintest.h
diff --git a/messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/briefheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/briefheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/briefheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/customheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/customheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/customheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/customheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/customheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/enterpriseheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/fancyheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/fancyheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/fancyheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/grantleeheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp \
b/messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.cpp
                
diff --git a/messageviewer/src/header/autotests/headerstylepluginmanagertest.h \
b/messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/headerstylepluginmanagertest.h rename to \
                messagelib/messageviewer/src/header/autotests/headerstylepluginmanagertest.h
                
diff --git a/messageviewer/src/header/autotests/longheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/longheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/longheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/longheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/longheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp \
b/messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp \
similarity index 100% rename from \
messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp rename to \
                messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.cpp
                
diff --git a/messageviewer/src/header/autotests/standardsheaderstyleplugintest.h \
b/messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.h \
similarity index 100% rename from \
messageviewer/src/header/autotests/standardsheaderstyleplugintest.h rename to \
                messagelib/messageviewer/src/header/autotests/standardsheaderstyleplugintest.h
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.cpp
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstrategy.h
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.cpp
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyle.h
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h \
similarity index 100% rename from \
messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h rename to \
                messagelib/messageviewer/src/header/briefheaderstyleplugin/briefheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/briefheaderstyleplugin/messageviewer_briefheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/contactdisplaymessagememento.cpp \
b/messagelib/messageviewer/src/header/contactdisplaymessagememento.cpp similarity \
index 100% rename from messageviewer/src/header/contactdisplaymessagememento.cpp
rename to messagelib/messageviewer/src/header/contactdisplaymessagememento.cpp
diff --git a/messageviewer/src/header/contactdisplaymessagememento.h \
b/messagelib/messageviewer/src/header/contactdisplaymessagememento.h similarity index \
100% rename from messageviewer/src/header/contactdisplaymessagememento.h
rename to messagelib/messageviewer/src/header/contactdisplaymessagememento.h
diff --git a/messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/customheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp
rename to messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.cpp
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h \
similarity index 100% rename from \
messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h rename to \
                messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstrategy.h
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp \
similarity index 100% rename from \
messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp rename to \
                messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.cpp
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h \
similarity index 100% rename from \
messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h rename to \
                messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyle.h
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h
 rename to messagelib/messageviewer/src/header/customheaderstyleplugin/customheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/customheaderstyleplugin/messageviewer_customheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/data/messageviewer_header_themes.knsrc \
b/messagelib/messageviewer/src/header/data/messageviewer_header_themes.knsrc \
similarity index 100% rename from \
messageviewer/src/header/data/messageviewer_header_themes.knsrc rename to \
                messagelib/messageviewer/src/header/data/messageviewer_header_themes.knsrc
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyle.h
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/enterpriseheaderstyleplugin/messageviewer_enterpriseheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/fancyheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp \
similarity index 100% rename from \
messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp rename to \
                messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.cpp
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h \
similarity index 100% rename from \
messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h rename to \
                messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyle.h
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h \
similarity index 100% rename from \
messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h rename to \
                messagelib/messageviewer/src/header/fancyheaderstyleplugin/fancyheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/fancyheaderstyleplugin/messageviewer_fancyheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/grantleeheaderformatter.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderformatter.cpp similarity index \
100% rename from messageviewer/src/header/grantleeheaderformatter.cpp
rename to messagelib/messageviewer/src/header/grantleeheaderformatter.cpp
diff --git a/messageviewer/src/header/grantleeheaderformatter.h \
b/messagelib/messageviewer/src/header/grantleeheaderformatter.h similarity index 100%
rename from messageviewer/src/header/grantleeheaderformatter.h
rename to messagelib/messageviewer/src/header/grantleeheaderformatter.h
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/grantleeheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.cpp
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstrategy.h
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.cpp
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h \
similarity index 100% rename from \
messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h rename to \
                messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyle.h
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/grantleeheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/grantleeheaderteststyle.cpp \
b/messagelib/messageviewer/src/header/grantleeheaderteststyle.cpp similarity index \
100% rename from messageviewer/src/header/grantleeheaderteststyle.cpp
rename to messagelib/messageviewer/src/header/grantleeheaderteststyle.cpp
diff --git a/messageviewer/src/header/grantleeheaderteststyle.h \
b/messagelib/messageviewer/src/header/grantleeheaderteststyle.h similarity index 100%
rename from messageviewer/src/header/grantleeheaderteststyle.h
rename to messagelib/messageviewer/src/header/grantleeheaderteststyle.h
diff --git a/messageviewer/src/header/headerstrategy.cpp \
b/messagelib/messageviewer/src/header/headerstrategy.cpp similarity index 100%
rename from messageviewer/src/header/headerstrategy.cpp
rename to messagelib/messageviewer/src/header/headerstrategy.cpp
diff --git a/messageviewer/src/header/headerstrategy.h \
b/messagelib/messageviewer/src/header/headerstrategy.h similarity index 100%
rename from messageviewer/src/header/headerstrategy.h
rename to messagelib/messageviewer/src/header/headerstrategy.h
diff --git a/messageviewer/src/header/headerstyle.cpp \
b/messagelib/messageviewer/src/header/headerstyle.cpp similarity index 100%
rename from messageviewer/src/header/headerstyle.cpp
rename to messagelib/messageviewer/src/header/headerstyle.cpp
diff --git a/messageviewer/src/header/headerstyle.h \
b/messagelib/messageviewer/src/header/headerstyle.h similarity index 100%
rename from messageviewer/src/header/headerstyle.h
rename to messagelib/messageviewer/src/header/headerstyle.h
diff --git a/messageviewer/src/header/headerstyle_util.cpp \
b/messagelib/messageviewer/src/header/headerstyle_util.cpp similarity index 100%
rename from messageviewer/src/header/headerstyle_util.cpp
rename to messagelib/messageviewer/src/header/headerstyle_util.cpp
diff --git a/messageviewer/src/header/headerstyle_util.h \
b/messagelib/messageviewer/src/header/headerstyle_util.h similarity index 100%
rename from messageviewer/src/header/headerstyle_util.h
rename to messagelib/messageviewer/src/header/headerstyle_util.h
diff --git a/messageviewer/src/header/headerstyleinterface.cpp \
b/messagelib/messageviewer/src/header/headerstyleinterface.cpp similarity index 100%
rename from messageviewer/src/header/headerstyleinterface.cpp
rename to messagelib/messageviewer/src/header/headerstyleinterface.cpp
diff --git a/messageviewer/src/header/headerstyleinterface.h \
b/messagelib/messageviewer/src/header/headerstyleinterface.h similarity index 100%
rename from messageviewer/src/header/headerstyleinterface.h
rename to messagelib/messageviewer/src/header/headerstyleinterface.h
diff --git a/messageviewer/src/header/headerstylemenumanager.cpp \
b/messagelib/messageviewer/src/header/headerstylemenumanager.cpp similarity index \
100% rename from messageviewer/src/header/headerstylemenumanager.cpp
rename to messagelib/messageviewer/src/header/headerstylemenumanager.cpp
diff --git a/messageviewer/src/header/headerstylemenumanager.h \
b/messagelib/messageviewer/src/header/headerstylemenumanager.h similarity index 100%
rename from messageviewer/src/header/headerstylemenumanager.h
rename to messagelib/messageviewer/src/header/headerstylemenumanager.h
diff --git a/messageviewer/src/header/headerstyleplugin.cpp \
b/messagelib/messageviewer/src/header/headerstyleplugin.cpp similarity index 100%
rename from messageviewer/src/header/headerstyleplugin.cpp
rename to messagelib/messageviewer/src/header/headerstyleplugin.cpp
diff --git a/messageviewer/src/header/headerstyleplugin.h \
b/messagelib/messageviewer/src/header/headerstyleplugin.h similarity index 100%
rename from messageviewer/src/header/headerstyleplugin.h
rename to messagelib/messageviewer/src/header/headerstyleplugin.h
diff --git a/messageviewer/src/header/headerstylepluginmanager.cpp \
b/messagelib/messageviewer/src/header/headerstylepluginmanager.cpp similarity index \
100% rename from messageviewer/src/header/headerstylepluginmanager.cpp
rename to messagelib/messageviewer/src/header/headerstylepluginmanager.cpp
diff --git a/messageviewer/src/header/headerstylepluginmanager.h \
b/messagelib/messageviewer/src/header/headerstylepluginmanager.h similarity index \
100% rename from messageviewer/src/header/headerstylepluginmanager.h
rename to messagelib/messageviewer/src/header/headerstylepluginmanager.h
diff --git a/messageviewer/src/header/kxface.cpp \
b/messagelib/messageviewer/src/header/kxface.cpp similarity index 100%
rename from messageviewer/src/header/kxface.cpp
rename to messagelib/messageviewer/src/header/kxface.cpp
diff --git a/messageviewer/src/header/kxface.h \
b/messagelib/messageviewer/src/header/kxface.h similarity index 100%
rename from messageviewer/src/header/kxface.h
rename to messagelib/messageviewer/src/header/kxface.h
diff --git a/messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt similarity \
index 100% rename from messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt
rename to messagelib/messageviewer/src/header/longheaderstyleplugin/CMakeLists.txt
diff --git a/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h
rename to messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp \
similarity index 100% rename from \
messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp rename to \
                messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h \
similarity index 100% rename from \
messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h rename to \
                messagelib/messageviewer/src/header/longheaderstyleplugin/longheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/longheaderstyleplugin/messageviewer_longheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/plainheaderstyle.cpp \
b/messagelib/messageviewer/src/header/plainheaderstyle.cpp similarity index 100%
rename from messageviewer/src/header/plainheaderstyle.cpp
rename to messagelib/messageviewer/src/header/plainheaderstyle.cpp
diff --git a/messageviewer/src/header/plainheaderstyle.h \
b/messagelib/messageviewer/src/header/plainheaderstyle.h similarity index 100%
rename from messageviewer/src/header/plainheaderstyle.h
rename to messagelib/messageviewer/src/header/plainheaderstyle.h
diff --git a/messageviewer/src/header/richheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/richheaderstrategy.cpp similarity index 100%
rename from messageviewer/src/header/richheaderstrategy.cpp
rename to messagelib/messageviewer/src/header/richheaderstrategy.cpp
diff --git a/messageviewer/src/header/richheaderstrategy.h \
b/messagelib/messageviewer/src/header/richheaderstrategy.h similarity index 100%
rename from messageviewer/src/header/richheaderstrategy.h
rename to messagelib/messageviewer/src/header/richheaderstrategy.h
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/header/standardsheaderstyleplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/messageviewer_standardsheaderstyleplugin.desktop
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.cpp
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardheaderstrategy.h
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.cpp
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleinterface.h
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
                
diff --git a/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h \
b/messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h
 similarity index 100%
rename from messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h
 rename to messagelib/messageviewer/src/header/standardsheaderstyleplugin/standardsheaderstyleplugin.h
                
diff --git a/messageviewer/src/header/tests/CMakeLists.txt \
b/messagelib/messageviewer/src/header/tests/CMakeLists.txt similarity index 100%
rename from messageviewer/src/header/tests/CMakeLists.txt
rename to messagelib/messageviewer/src/header/tests/CMakeLists.txt
diff --git a/messageviewer/src/header/tests/headerstylemenu_gui.cpp \
b/messagelib/messageviewer/src/header/tests/headerstylemenu_gui.cpp similarity index \
100% rename from messageviewer/src/header/tests/headerstylemenu_gui.cpp
rename to messagelib/messageviewer/src/header/tests/headerstylemenu_gui.cpp
diff --git a/messageviewer/src/header/tests/headerstylemenu_gui.h \
b/messagelib/messageviewer/src/header/tests/headerstylemenu_gui.h similarity index \
100% rename from messageviewer/src/header/tests/headerstylemenu_gui.h
rename to messagelib/messageviewer/src/header/tests/headerstylemenu_gui.h
diff --git a/messageviewer/src/htmlwriter/filehtmlwriter.cpp \
b/messagelib/messageviewer/src/htmlwriter/filehtmlwriter.cpp similarity index 100%
rename from messageviewer/src/htmlwriter/filehtmlwriter.cpp
rename to messagelib/messageviewer/src/htmlwriter/filehtmlwriter.cpp
diff --git a/messageviewer/src/htmlwriter/filehtmlwriter.h \
b/messagelib/messageviewer/src/htmlwriter/filehtmlwriter.h similarity index 100%
rename from messageviewer/src/htmlwriter/filehtmlwriter.h
rename to messagelib/messageviewer/src/htmlwriter/filehtmlwriter.h
diff --git a/messageviewer/src/htmlwriter/queuehtmlwriter.cpp \
b/messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.cpp similarity index 100%
rename from messageviewer/src/htmlwriter/queuehtmlwriter.cpp
rename to messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.cpp
diff --git a/messageviewer/src/htmlwriter/queuehtmlwriter.h \
b/messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.h similarity index 100%
rename from messageviewer/src/htmlwriter/queuehtmlwriter.h
rename to messagelib/messageviewer/src/htmlwriter/queuehtmlwriter.h
diff --git a/messageviewer/src/htmlwriter/teehtmlwriter.cpp \
b/messagelib/messageviewer/src/htmlwriter/teehtmlwriter.cpp similarity index 100%
rename from messageviewer/src/htmlwriter/teehtmlwriter.cpp
rename to messagelib/messageviewer/src/htmlwriter/teehtmlwriter.cpp
diff --git a/messageviewer/src/htmlwriter/teehtmlwriter.h \
b/messagelib/messageviewer/src/htmlwriter/teehtmlwriter.h similarity index 100%
rename from messageviewer/src/htmlwriter/teehtmlwriter.h
rename to messagelib/messageviewer/src/htmlwriter/teehtmlwriter.h
diff --git a/messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp \
b/messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp similarity index \
100% rename from messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp
rename to messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp
diff --git a/messageviewer/src/htmlwriter/webkitparthtmlwriter.h \
b/messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.h similarity index \
100% rename from messageviewer/src/htmlwriter/webkitparthtmlwriter.h
rename to messagelib/messageviewer/src/htmlwriter/webkitparthtmlwriter.h
diff --git a/messageviewer/src/interfaces/bodypart.h \
b/messagelib/messageviewer/src/interfaces/bodypart.h similarity index 100%
rename from messageviewer/src/interfaces/bodypart.h
rename to messagelib/messageviewer/src/interfaces/bodypart.h
diff --git a/messageviewer/src/interfaces/bodypartformatter.h \
b/messagelib/messageviewer/src/interfaces/bodypartformatter.h similarity index 100%
rename from messageviewer/src/interfaces/bodypartformatter.h
rename to messagelib/messageviewer/src/interfaces/bodypartformatter.h
diff --git a/messageviewer/src/interfaces/bodyparturlhandler.h \
b/messagelib/messageviewer/src/interfaces/bodyparturlhandler.h similarity index 100%
rename from messageviewer/src/interfaces/bodyparturlhandler.h
rename to messagelib/messageviewer/src/interfaces/bodyparturlhandler.h
diff --git a/messageviewer/src/interfaces/htmlwriter.h \
b/messagelib/messageviewer/src/interfaces/htmlwriter.h similarity index 100%
rename from messageviewer/src/interfaces/htmlwriter.h
rename to messagelib/messageviewer/src/interfaces/htmlwriter.h
diff --git a/messageviewer/src/interfaces/urlhandler.h \
b/messagelib/messageviewer/src/interfaces/urlhandler.h similarity index 100%
rename from messageviewer/src/interfaces/urlhandler.h
rename to messagelib/messageviewer/src/interfaces/urlhandler.h
diff --git a/messageviewer/src/job/attachmenteditjob.cpp \
b/messagelib/messageviewer/src/job/attachmenteditjob.cpp similarity index 100%
rename from messageviewer/src/job/attachmenteditjob.cpp
rename to messagelib/messageviewer/src/job/attachmenteditjob.cpp
diff --git a/messageviewer/src/job/attachmenteditjob.h \
b/messagelib/messageviewer/src/job/attachmenteditjob.h similarity index 100%
rename from messageviewer/src/job/attachmenteditjob.h
rename to messagelib/messageviewer/src/job/attachmenteditjob.h
diff --git a/messageviewer/src/job/createeventjob.cpp \
b/messagelib/messageviewer/src/job/createeventjob.cpp similarity index 100%
rename from messageviewer/src/job/createeventjob.cpp
rename to messagelib/messageviewer/src/job/createeventjob.cpp
diff --git a/messageviewer/src/job/createeventjob.h \
b/messagelib/messageviewer/src/job/createeventjob.h similarity index 100%
rename from messageviewer/src/job/createeventjob.h
rename to messagelib/messageviewer/src/job/createeventjob.h
diff --git a/messageviewer/src/job/createnotejob.cpp \
b/messagelib/messageviewer/src/job/createnotejob.cpp similarity index 100%
rename from messageviewer/src/job/createnotejob.cpp
rename to messagelib/messageviewer/src/job/createnotejob.cpp
diff --git a/messageviewer/src/job/createnotejob.h \
b/messagelib/messageviewer/src/job/createnotejob.h similarity index 100%
rename from messageviewer/src/job/createnotejob.h
rename to messagelib/messageviewer/src/job/createnotejob.h
diff --git a/messageviewer/src/job/createtodojob.cpp \
b/messagelib/messageviewer/src/job/createtodojob.cpp similarity index 100%
rename from messageviewer/src/job/createtodojob.cpp
rename to messagelib/messageviewer/src/job/createtodojob.cpp
diff --git a/messageviewer/src/job/createtodojob.h \
b/messagelib/messageviewer/src/job/createtodojob.h similarity index 100%
rename from messageviewer/src/job/createtodojob.h
rename to messagelib/messageviewer/src/job/createtodojob.h
diff --git a/messageviewer/src/job/kleojobexecutor.cpp \
b/messagelib/messageviewer/src/job/kleojobexecutor.cpp similarity index 100%
rename from messageviewer/src/job/kleojobexecutor.cpp
rename to messagelib/messageviewer/src/job/kleojobexecutor.cpp
diff --git a/messageviewer/src/job/kleojobexecutor.h \
b/messagelib/messageviewer/src/job/kleojobexecutor.h similarity index 100%
rename from messageviewer/src/job/kleojobexecutor.h
rename to messagelib/messageviewer/src/job/kleojobexecutor.h
diff --git a/messageviewer/src/job/modifymessagedisplayformatjob.cpp \
b/messagelib/messageviewer/src/job/modifymessagedisplayformatjob.cpp similarity index \
100% rename from messageviewer/src/job/modifymessagedisplayformatjob.cpp
rename to messagelib/messageviewer/src/job/modifymessagedisplayformatjob.cpp
diff --git a/messageviewer/src/job/modifymessagedisplayformatjob.h \
b/messagelib/messageviewer/src/job/modifymessagedisplayformatjob.h similarity index \
100% rename from messageviewer/src/job/modifymessagedisplayformatjob.h
rename to messagelib/messageviewer/src/job/modifymessagedisplayformatjob.h
diff --git a/messageviewer/src/kconf_update/CMakeLists.txt \
b/messagelib/messageviewer/src/kconf_update/CMakeLists.txt similarity index 100%
rename from messageviewer/src/kconf_update/CMakeLists.txt
rename to messagelib/messageviewer/src/kconf_update/CMakeLists.txt
diff --git a/messageviewer/src/kconf_update/messageviewer.upd \
b/messagelib/messageviewer/src/kconf_update/messageviewer.upd similarity index 100%
rename from messageviewer/src/kconf_update/messageviewer.upd
rename to messagelib/messageviewer/src/kconf_update/messageviewer.upd
diff --git a/messageviewer/src/notify/messageviewer.notifyrc \
b/messagelib/messageviewer/src/notify/messageviewer.notifyrc similarity index 100%
rename from messageviewer/src/notify/messageviewer.notifyrc
rename to messagelib/messageviewer/src/notify/messageviewer.notifyrc
diff --git a/messageviewer/src/objecttreesourceif.h \
b/messagelib/messageviewer/src/objecttreesourceif.h similarity index 100%
rename from messageviewer/src/objecttreesourceif.h
rename to messagelib/messageviewer/src/objecttreesourceif.h
diff --git a/messageviewer/src/pics/CMakeLists.txt \
b/messagelib/messageviewer/src/pics/CMakeLists.txt similarity index 100%
rename from messageviewer/src/pics/CMakeLists.txt
rename to messagelib/messageviewer/src/pics/CMakeLists.txt
diff --git a/messageviewer/src/pics/enterprise_bottom.png \
b/messagelib/messageviewer/src/pics/enterprise_bottom.png similarity index 100%
rename from messageviewer/src/pics/enterprise_bottom.png
rename to messagelib/messageviewer/src/pics/enterprise_bottom.png
diff --git a/messageviewer/src/pics/enterprise_bottom_left.png \
b/messagelib/messageviewer/src/pics/enterprise_bottom_left.png similarity index 100%
rename from messageviewer/src/pics/enterprise_bottom_left.png
rename to messagelib/messageviewer/src/pics/enterprise_bottom_left.png
diff --git a/messageviewer/src/pics/enterprise_bottom_right.png \
b/messagelib/messageviewer/src/pics/enterprise_bottom_right.png similarity index 100%
rename from messageviewer/src/pics/enterprise_bottom_right.png
rename to messagelib/messageviewer/src/pics/enterprise_bottom_right.png
diff --git a/messageviewer/src/pics/enterprise_icon.png \
b/messagelib/messageviewer/src/pics/enterprise_icon.png similarity index 100%
rename from messageviewer/src/pics/enterprise_icon.png
rename to messagelib/messageviewer/src/pics/enterprise_icon.png
diff --git a/messageviewer/src/pics/enterprise_left.png \
b/messagelib/messageviewer/src/pics/enterprise_left.png similarity index 100%
rename from messageviewer/src/pics/enterprise_left.png
rename to messagelib/messageviewer/src/pics/enterprise_left.png
diff --git a/messageviewer/src/pics/enterprise_right.png \
b/messagelib/messageviewer/src/pics/enterprise_right.png similarity index 100%
rename from messageviewer/src/pics/enterprise_right.png
rename to messagelib/messageviewer/src/pics/enterprise_right.png
diff --git a/messageviewer/src/pics/enterprise_s_left.png \
b/messagelib/messageviewer/src/pics/enterprise_s_left.png similarity index 100%
rename from messageviewer/src/pics/enterprise_s_left.png
rename to messagelib/messageviewer/src/pics/enterprise_s_left.png
diff --git a/messageviewer/src/pics/enterprise_s_right.png \
b/messagelib/messageviewer/src/pics/enterprise_s_right.png similarity index 100%
rename from messageviewer/src/pics/enterprise_s_right.png
rename to messagelib/messageviewer/src/pics/enterprise_s_right.png
diff --git a/messageviewer/src/pics/enterprise_sbar.png \
b/messagelib/messageviewer/src/pics/enterprise_sbar.png similarity index 100%
rename from messageviewer/src/pics/enterprise_sbar.png
rename to messagelib/messageviewer/src/pics/enterprise_sbar.png
diff --git a/messageviewer/src/pics/enterprise_sp_right.png \
b/messagelib/messageviewer/src/pics/enterprise_sp_right.png similarity index 100%
rename from messageviewer/src/pics/enterprise_sp_right.png
rename to messagelib/messageviewer/src/pics/enterprise_sp_right.png
diff --git a/messageviewer/src/pics/enterprise_sw.png \
b/messagelib/messageviewer/src/pics/enterprise_sw.png similarity index 100%
rename from messageviewer/src/pics/enterprise_sw.png
rename to messagelib/messageviewer/src/pics/enterprise_sw.png
diff --git a/messageviewer/src/pics/enterprise_top.png \
b/messagelib/messageviewer/src/pics/enterprise_top.png similarity index 100%
rename from messageviewer/src/pics/enterprise_top.png
rename to messagelib/messageviewer/src/pics/enterprise_top.png
diff --git a/messageviewer/src/pics/enterprise_top_left.png \
b/messagelib/messageviewer/src/pics/enterprise_top_left.png similarity index 100%
rename from messageviewer/src/pics/enterprise_top_left.png
rename to messagelib/messageviewer/src/pics/enterprise_top_left.png
diff --git a/messageviewer/src/pics/enterprise_top_right.png \
b/messagelib/messageviewer/src/pics/enterprise_top_right.png similarity index 100%
rename from messageviewer/src/pics/enterprise_top_right.png
rename to messagelib/messageviewer/src/pics/enterprise_top_right.png
diff --git a/messageviewer/src/pics/enterprise_w.png \
b/messagelib/messageviewer/src/pics/enterprise_w.png similarity index 100%
rename from messageviewer/src/pics/enterprise_w.png
rename to messagelib/messageviewer/src/pics/enterprise_w.png
diff --git a/messageviewer/src/pics/quicklistClosed.png \
b/messagelib/messageviewer/src/pics/quicklistClosed.png similarity index 100%
rename from messageviewer/src/pics/quicklistClosed.png
rename to messagelib/messageviewer/src/pics/quicklistClosed.png
diff --git a/messageviewer/src/pics/quicklistOpened.png \
b/messagelib/messageviewer/src/pics/quicklistOpened.png similarity index 100%
rename from messageviewer/src/pics/quicklistOpened.png
rename to messagelib/messageviewer/src/pics/quicklistOpened.png
diff --git a/messageviewer/src/pics/quotecollapse.png \
b/messagelib/messageviewer/src/pics/quotecollapse.png similarity index 100%
rename from messageviewer/src/pics/quotecollapse.png
rename to messagelib/messageviewer/src/pics/quotecollapse.png
diff --git a/messageviewer/src/pics/quoteexpand.png \
b/messagelib/messageviewer/src/pics/quoteexpand.png similarity index 100%
rename from messageviewer/src/pics/quoteexpand.png
rename to messagelib/messageviewer/src/pics/quoteexpand.png
diff --git a/messageviewer/src/scamdetection/autotests/CMakeLists.txt \
b/messagelib/messageviewer/src/scamdetection/autotests/CMakeLists.txt similarity \
index 100% rename from messageviewer/src/scamdetection/autotests/CMakeLists.txt
rename to messagelib/messageviewer/src/scamdetection/autotests/CMakeLists.txt
diff --git a/messageviewer/src/scamdetection/autotests/scamattributetest.cpp \
b/messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.cpp \
similarity index 100% rename from \
messageviewer/src/scamdetection/autotests/scamattributetest.cpp rename to \
                messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.cpp
                
diff --git a/messageviewer/src/scamdetection/autotests/scamattributetest.h \
b/messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.h similarity \
index 100% rename from messageviewer/src/scamdetection/autotests/scamattributetest.h
rename to messagelib/messageviewer/src/scamdetection/autotests/scamattributetest.h
diff --git a/messageviewer/src/scamdetection/autotests/test_scamdetection.cpp \
b/messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.cpp \
similarity index 100% rename from \
messageviewer/src/scamdetection/autotests/test_scamdetection.cpp rename to \
                messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.cpp
                
diff --git a/messageviewer/src/scamdetection/autotests/test_scamdetection.h \
b/messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.h \
similarity index 100% rename from \
messageviewer/src/scamdetection/autotests/test_scamdetection.h rename to \
                messagelib/messageviewer/src/scamdetection/autotests/test_scamdetection.h
                
diff --git a/messageviewer/src/scamdetection/data/longurlServices.json \
b/messagelib/messageviewer/src/scamdetection/data/longurlServices.json similarity \
index 100% rename from messageviewer/src/scamdetection/data/longurlServices.json
rename to messagelib/messageviewer/src/scamdetection/data/longurlServices.json
diff --git a/messageviewer/src/scamdetection/scamattribute.cpp \
b/messagelib/messageviewer/src/scamdetection/scamattribute.cpp similarity index 100%
rename from messageviewer/src/scamdetection/scamattribute.cpp
rename to messagelib/messageviewer/src/scamdetection/scamattribute.cpp
diff --git a/messageviewer/src/scamdetection/scamattribute.h \
b/messagelib/messageviewer/src/scamdetection/scamattribute.h similarity index 100%
rename from messageviewer/src/scamdetection/scamattribute.h
rename to messagelib/messageviewer/src/scamdetection/scamattribute.h
diff --git a/messageviewer/src/scamdetection/scamcheckshorturl.cpp \
b/messagelib/messageviewer/src/scamdetection/scamcheckshorturl.cpp similarity index \
100% rename from messageviewer/src/scamdetection/scamcheckshorturl.cpp
rename to messagelib/messageviewer/src/scamdetection/scamcheckshorturl.cpp
diff --git a/messageviewer/src/scamdetection/scamcheckshorturl.h \
b/messagelib/messageviewer/src/scamdetection/scamcheckshorturl.h similarity index \
100% rename from messageviewer/src/scamdetection/scamcheckshorturl.h
rename to messagelib/messageviewer/src/scamdetection/scamcheckshorturl.h
diff --git a/messageviewer/src/scamdetection/scamdetection.cpp \
b/messagelib/messageviewer/src/scamdetection/scamdetection.cpp similarity index 100%
rename from messageviewer/src/scamdetection/scamdetection.cpp
rename to messagelib/messageviewer/src/scamdetection/scamdetection.cpp
diff --git a/messageviewer/src/scamdetection/scamdetection.h \
b/messagelib/messageviewer/src/scamdetection/scamdetection.h similarity index 100%
rename from messageviewer/src/scamdetection/scamdetection.h
rename to messagelib/messageviewer/src/scamdetection/scamdetection.h
diff --git a/messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp \
b/messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp \
similarity index 100% rename from \
messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp rename to \
                messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp
                
diff --git a/messageviewer/src/scamdetection/scamdetectiondetailsdialog.h \
b/messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.h similarity \
index 100% rename from messageviewer/src/scamdetection/scamdetectiondetailsdialog.h
rename to messagelib/messageviewer/src/scamdetection/scamdetectiondetailsdialog.h
diff --git a/messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp \
b/messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp \
similarity index 100% rename from \
messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp rename to \
                messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp
                
diff --git a/messageviewer/src/scamdetection/scamdetectionwarningwidget.h \
b/messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.h similarity \
index 100% rename from messageviewer/src/scamdetection/scamdetectionwarningwidget.h
rename to messagelib/messageviewer/src/scamdetection/scamdetectionwarningwidget.h
diff --git a/messageviewer/src/scamdetection/tests/CMakeLists.txt \
b/messagelib/messageviewer/src/scamdetection/tests/CMakeLists.txt similarity index \
100% rename from messageviewer/src/scamdetection/tests/CMakeLists.txt
rename to messagelib/messageviewer/src/scamdetection/tests/CMakeLists.txt
diff --git a/messageviewer/src/scamdetection/tests/scamdetection_gui.cpp \
b/messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.cpp similarity \
index 100% rename from messageviewer/src/scamdetection/tests/scamdetection_gui.cpp
rename to messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.cpp
diff --git a/messageviewer/src/scamdetection/tests/scamdetection_gui.h \
b/messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.h similarity \
index 100% rename from messageviewer/src/scamdetection/tests/scamdetection_gui.h
rename to messagelib/messageviewer/src/scamdetection/tests/scamdetection_gui.h
diff --git a/messageviewer/src/settings/globalsettings_messageviewer.kcfgc \
b/messagelib/messageviewer/src/settings/globalsettings_messageviewer.kcfgc similarity \
index 100% rename from messageviewer/src/settings/globalsettings_messageviewer.kcfgc
rename to messagelib/messageviewer/src/settings/globalsettings_messageviewer.kcfgc
diff --git a/messageviewer/src/settings/messageviewer.kcfg.cmake \
b/messagelib/messageviewer/src/settings/messageviewer.kcfg.cmake similarity index \
100% rename from messageviewer/src/settings/messageviewer.kcfg.cmake
rename to messagelib/messageviewer/src/settings/messageviewer.kcfg.cmake
diff --git a/messageviewer/src/settings/messageviewersettings.cpp \
b/messagelib/messageviewer/src/settings/messageviewersettings.cpp similarity index \
100% rename from messageviewer/src/settings/messageviewersettings.cpp
rename to messagelib/messageviewer/src/settings/messageviewersettings.cpp
diff --git a/messageviewer/src/settings/messageviewersettings.h \
b/messagelib/messageviewer/src/settings/messageviewersettings.h similarity index 100%
rename from messageviewer/src/settings/messageviewersettings.h
rename to messagelib/messageviewer/src/settings/messageviewersettings.h
diff --git a/messageviewer/src/themes/example/header.desktop \
b/messagelib/messageviewer/src/themes/example/header.desktop similarity index 100%
rename from messageviewer/src/themes/example/header.desktop
rename to messagelib/messageviewer/src/themes/example/header.desktop
diff --git a/messageviewer/src/themes/example/header.html \
b/messagelib/messageviewer/src/themes/example/header.html similarity index 100%
rename from messageviewer/src/themes/example/header.html
rename to messagelib/messageviewer/src/themes/example/header.html
diff --git a/messageviewer/src/themes/example/header_row.html \
b/messagelib/messageviewer/src/themes/example/header_row.html similarity index 100%
rename from messageviewer/src/themes/example/header_row.html
rename to messagelib/messageviewer/src/themes/example/header_row.html
diff --git a/messageviewer/src/themes/example_fancy/header.desktop \
b/messagelib/messageviewer/src/themes/example_fancy/header.desktop similarity index \
100% rename from messageviewer/src/themes/example_fancy/header.desktop
rename to messagelib/messageviewer/src/themes/example_fancy/header.desktop
diff --git a/messageviewer/src/themes/example_fancy/header.html \
b/messagelib/messageviewer/src/themes/example_fancy/header.html similarity index 100%
rename from messageviewer/src/themes/example_fancy/header.html
rename to messagelib/messageviewer/src/themes/example_fancy/header.html
diff --git a/messageviewer/src/ui/invitationsettings.ui \
b/messagelib/messageviewer/src/ui/invitationsettings.ui similarity index 100%
rename from messageviewer/src/ui/invitationsettings.ui
rename to messagelib/messageviewer/src/ui/invitationsettings.ui
diff --git a/messageviewer/src/ui/printingsettings.ui \
b/messagelib/messageviewer/src/ui/printingsettings.ui similarity index 100%
rename from messageviewer/src/ui/printingsettings.ui
rename to messagelib/messageviewer/src/ui/printingsettings.ui
diff --git a/messageviewer/src/ui/settings.ui \
b/messagelib/messageviewer/src/ui/settings.ui similarity index 100%
rename from messageviewer/src/ui/settings.ui
rename to messagelib/messageviewer/src/ui/settings.ui
diff --git a/messageviewer/src/utils/iconnamecache.cpp \
b/messagelib/messageviewer/src/utils/iconnamecache.cpp similarity index 100%
rename from messageviewer/src/utils/iconnamecache.cpp
rename to messagelib/messageviewer/src/utils/iconnamecache.cpp
diff --git a/messageviewer/src/utils/iconnamecache.h \
b/messagelib/messageviewer/src/utils/iconnamecache.h similarity index 100%
rename from messageviewer/src/utils/iconnamecache.h
rename to messagelib/messageviewer/src/utils/iconnamecache.h
diff --git a/messageviewer/src/utils/markmessagereadhandler.cpp \
b/messagelib/messageviewer/src/utils/markmessagereadhandler.cpp similarity index 100%
rename from messageviewer/src/utils/markmessagereadhandler.cpp
rename to messagelib/messageviewer/src/utils/markmessagereadhandler.cpp
diff --git a/messageviewer/src/utils/markmessagereadhandler.h \
b/messagelib/messageviewer/src/utils/markmessagereadhandler.h similarity index 100%
rename from messageviewer/src/utils/markmessagereadhandler.h
rename to messagelib/messageviewer/src/utils/markmessagereadhandler.h
diff --git a/messageviewer/src/utils/messageviewerutil.cpp \
b/messagelib/messageviewer/src/utils/messageviewerutil.cpp similarity index 100%
rename from messageviewer/src/utils/messageviewerutil.cpp
rename to messagelib/messageviewer/src/utils/messageviewerutil.cpp
diff --git a/messageviewer/src/utils/messageviewerutil.h \
b/messagelib/messageviewer/src/utils/messageviewerutil.h similarity index 100%
rename from messageviewer/src/utils/messageviewerutil.h
rename to messagelib/messageviewer/src/utils/messageviewerutil.h
diff --git a/messageviewer/src/viewer/attachmentstrategy.cpp \
b/messagelib/messageviewer/src/viewer/attachmentstrategy.cpp similarity index 100%
rename from messageviewer/src/viewer/attachmentstrategy.cpp
rename to messagelib/messageviewer/src/viewer/attachmentstrategy.cpp
diff --git a/messageviewer/src/viewer/attachmentstrategy.h \
b/messagelib/messageviewer/src/viewer/attachmentstrategy.h similarity index 100%
rename from messageviewer/src/viewer/attachmentstrategy.h
rename to messagelib/messageviewer/src/viewer/attachmentstrategy.h
diff --git a/messageviewer/src/viewer/bodypartformatter.cpp \
b/messagelib/messageviewer/src/viewer/bodypartformatter.cpp similarity index 100%
rename from messageviewer/src/viewer/bodypartformatter.cpp
rename to messagelib/messageviewer/src/viewer/bodypartformatter.cpp
diff --git a/messageviewer/src/viewer/bodypartformatterfactory.cpp \
b/messagelib/messageviewer/src/viewer/bodypartformatterfactory.cpp similarity index \
100% rename from messageviewer/src/viewer/bodypartformatterfactory.cpp
rename to messagelib/messageviewer/src/viewer/bodypartformatterfactory.cpp
diff --git a/messageviewer/src/viewer/bodypartformatterfactory.h \
b/messagelib/messageviewer/src/viewer/bodypartformatterfactory.h similarity index \
100% rename from messageviewer/src/viewer/bodypartformatterfactory.h
rename to messagelib/messageviewer/src/viewer/bodypartformatterfactory.h
diff --git a/messageviewer/src/viewer/bodypartformatterfactory_p.h \
b/messagelib/messageviewer/src/viewer/bodypartformatterfactory_p.h similarity index \
100% rename from messageviewer/src/viewer/bodypartformatterfactory_p.h
rename to messagelib/messageviewer/src/viewer/bodypartformatterfactory_p.h
diff --git a/messageviewer/src/viewer/converthtmltoplaintext.cpp \
b/messagelib/messageviewer/src/viewer/converthtmltoplaintext.cpp similarity index \
100% rename from messageviewer/src/viewer/converthtmltoplaintext.cpp
rename to messagelib/messageviewer/src/viewer/converthtmltoplaintext.cpp
diff --git a/messageviewer/src/viewer/converthtmltoplaintext.h \
b/messagelib/messageviewer/src/viewer/converthtmltoplaintext.h similarity index 100%
rename from messageviewer/src/viewer/converthtmltoplaintext.h
rename to messagelib/messageviewer/src/viewer/converthtmltoplaintext.h
diff --git a/messageviewer/src/viewer/cryptohelper.cpp \
b/messagelib/messageviewer/src/viewer/cryptohelper.cpp similarity index 100%
rename from messageviewer/src/viewer/cryptohelper.cpp
rename to messagelib/messageviewer/src/viewer/cryptohelper.cpp
diff --git a/messageviewer/src/viewer/cryptohelper.h \
b/messagelib/messageviewer/src/viewer/cryptohelper.h similarity index 100%
rename from messageviewer/src/viewer/cryptohelper.h
rename to messagelib/messageviewer/src/viewer/cryptohelper.h
diff --git a/messageviewer/src/viewer/csshelper.cpp \
b/messagelib/messageviewer/src/viewer/csshelper.cpp similarity index 100%
rename from messageviewer/src/viewer/csshelper.cpp
rename to messagelib/messageviewer/src/viewer/csshelper.cpp
diff --git a/messageviewer/src/viewer/csshelper.h \
b/messagelib/messageviewer/src/viewer/csshelper.h similarity index 100%
rename from messageviewer/src/viewer/csshelper.h
rename to messagelib/messageviewer/src/viewer/csshelper.h
diff --git a/messageviewer/src/viewer/csshelperbase.cpp \
b/messagelib/messageviewer/src/viewer/csshelperbase.cpp similarity index 100%
rename from messageviewer/src/viewer/csshelperbase.cpp
rename to messagelib/messageviewer/src/viewer/csshelperbase.cpp
diff --git a/messageviewer/src/viewer/csshelperbase.h \
b/messagelib/messageviewer/src/viewer/csshelperbase.h similarity index 100%
rename from messageviewer/src/viewer/csshelperbase.h
rename to messagelib/messageviewer/src/viewer/csshelperbase.h
diff --git a/messageviewer/src/viewer/editorwatcher.cpp \
b/messagelib/messageviewer/src/viewer/editorwatcher.cpp similarity index 100%
rename from messageviewer/src/viewer/editorwatcher.cpp
rename to messagelib/messageviewer/src/viewer/editorwatcher.cpp
diff --git a/messageviewer/src/viewer/editorwatcher.h \
b/messagelib/messageviewer/src/viewer/editorwatcher.h similarity index 100%
rename from messageviewer/src/viewer/editorwatcher.h
rename to messagelib/messageviewer/src/viewer/editorwatcher.h
diff --git a/messageviewer/src/viewer/htmlquotecolorer.cpp \
b/messagelib/messageviewer/src/viewer/htmlquotecolorer.cpp similarity index 100%
rename from messageviewer/src/viewer/htmlquotecolorer.cpp
rename to messagelib/messageviewer/src/viewer/htmlquotecolorer.cpp
diff --git a/messageviewer/src/viewer/htmlquotecolorer.h \
b/messagelib/messageviewer/src/viewer/htmlquotecolorer.h similarity index 100%
rename from messageviewer/src/viewer/htmlquotecolorer.h
rename to messagelib/messageviewer/src/viewer/htmlquotecolorer.h
diff --git a/messageviewer/src/viewer/mailwebview.cpp \
b/messagelib/messageviewer/src/viewer/mailwebview.cpp similarity index 100%
rename from messageviewer/src/viewer/mailwebview.cpp
rename to messagelib/messageviewer/src/viewer/mailwebview.cpp
diff --git a/messageviewer/src/viewer/mailwebview.h \
b/messagelib/messageviewer/src/viewer/mailwebview.h similarity index 100%
rename from messageviewer/src/viewer/mailwebview.h
rename to messagelib/messageviewer/src/viewer/mailwebview.h
diff --git a/messageviewer/src/viewer/memento/cryptobodypartmemento.cpp \
b/messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.cpp similarity \
index 100% rename from messageviewer/src/viewer/memento/cryptobodypartmemento.cpp
rename to messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.cpp
diff --git a/messageviewer/src/viewer/memento/cryptobodypartmemento.h \
b/messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.h similarity \
index 100% rename from messageviewer/src/viewer/memento/cryptobodypartmemento.h
rename to messagelib/messageviewer/src/viewer/memento/cryptobodypartmemento.h
diff --git a/messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp \
b/messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp \
similarity index 100% rename from \
messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp rename to \
                messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.cpp
                
diff --git a/messageviewer/src/viewer/memento/decryptverifybodypartmemento.h \
b/messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.h \
similarity index 100% rename from \
messageviewer/src/viewer/memento/decryptverifybodypartmemento.h rename to \
                messagelib/messageviewer/src/viewer/memento/decryptverifybodypartmemento.h
                
diff --git a/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.cpp \
b/messagelib/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.cpp \
similarity index 100% rename from \
messageviewer/src/viewer/memento/verifydetachedbodypartmemento.cpp rename to \
                messagelib/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.cpp
                
diff --git a/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h \
b/messagelib/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h \
similarity index 100% rename from \
messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h rename to \
                messagelib/messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h
                
diff --git a/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp \
b/messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp \
similarity index 100% rename from \
messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp rename to \
                messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.cpp
                
diff --git a/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h \
b/messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h \
similarity index 100% rename from \
messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h rename to \
                messagelib/messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h
                
diff --git a/messageviewer/src/viewer/messagedisplayformatattribute.cpp \
b/messagelib/messageviewer/src/viewer/messagedisplayformatattribute.cpp similarity \
index 100% rename from messageviewer/src/viewer/messagedisplayformatattribute.cpp
rename to messagelib/messageviewer/src/viewer/messagedisplayformatattribute.cpp
diff --git a/messageviewer/src/viewer/messagedisplayformatattribute.h \
b/messagelib/messageviewer/src/viewer/messagedisplayformatattribute.h similarity \
index 100% rename from messageviewer/src/viewer/messagedisplayformatattribute.h
rename to messagelib/messageviewer/src/viewer/messagedisplayformatattribute.h
diff --git a/messageviewer/src/viewer/messagepart.cpp \
b/messagelib/messageviewer/src/viewer/messagepart.cpp similarity index 100%
rename from messageviewer/src/viewer/messagepart.cpp
rename to messagelib/messageviewer/src/viewer/messagepart.cpp
diff --git a/messageviewer/src/viewer/messagepart.h \
b/messagelib/messageviewer/src/viewer/messagepart.h similarity index 100%
rename from messageviewer/src/viewer/messagepart.h
rename to messagelib/messageviewer/src/viewer/messagepart.h
diff --git a/messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp \
b/messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp similarity \
index 100% rename from messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp
rename to messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.cpp
diff --git a/messageviewer/src/viewer/mimeparttree/mimeparttreeview.h \
b/messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.h similarity \
index 100% rename from messageviewer/src/viewer/mimeparttree/mimeparttreeview.h
rename to messagelib/messageviewer/src/viewer/mimeparttree/mimeparttreeview.h
diff --git a/messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp \
b/messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp similarity index \
100% rename from messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
rename to messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
diff --git a/messageviewer/src/viewer/mimeparttree/mimetreemodel.h \
b/messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.h similarity index \
100% rename from messageviewer/src/viewer/mimeparttree/mimetreemodel.h
rename to messagelib/messageviewer/src/viewer/mimeparttree/mimetreemodel.h
diff --git a/messageviewer/src/viewer/nodehelper.cpp \
b/messagelib/messageviewer/src/viewer/nodehelper.cpp similarity index 100%
rename from messageviewer/src/viewer/nodehelper.cpp
rename to messagelib/messageviewer/src/viewer/nodehelper.cpp
diff --git a/messageviewer/src/viewer/nodehelper.h \
b/messagelib/messageviewer/src/viewer/nodehelper.h similarity index 100%
rename from messageviewer/src/viewer/nodehelper.h
rename to messagelib/messageviewer/src/viewer/nodehelper.h
diff --git a/messageviewer/src/viewer/objecttreeemptysource.cpp \
b/messagelib/messageviewer/src/viewer/objecttreeemptysource.cpp similarity index 100%
rename from messageviewer/src/viewer/objecttreeemptysource.cpp
rename to messagelib/messageviewer/src/viewer/objecttreeemptysource.cpp
diff --git a/messageviewer/src/viewer/objecttreeemptysource.h \
b/messagelib/messageviewer/src/viewer/objecttreeemptysource.h similarity index 100%
rename from messageviewer/src/viewer/objecttreeemptysource.h
rename to messagelib/messageviewer/src/viewer/objecttreeemptysource.h
diff --git a/messageviewer/src/viewer/objecttreeparser.cpp \
b/messagelib/messageviewer/src/viewer/objecttreeparser.cpp similarity index 100%
rename from messageviewer/src/viewer/objecttreeparser.cpp
rename to messagelib/messageviewer/src/viewer/objecttreeparser.cpp
diff --git a/messageviewer/src/viewer/objecttreeparser.h \
b/messagelib/messageviewer/src/viewer/objecttreeparser.h similarity index 100%
rename from messageviewer/src/viewer/objecttreeparser.h
rename to messagelib/messageviewer/src/viewer/objecttreeparser.h
diff --git a/messageviewer/src/viewer/objecttreeviewersource.cpp \
b/messagelib/messageviewer/src/viewer/objecttreeviewersource.cpp similarity index \
100% rename from messageviewer/src/viewer/objecttreeviewersource.cpp
rename to messagelib/messageviewer/src/viewer/objecttreeviewersource.cpp
diff --git a/messageviewer/src/viewer/objecttreeviewersource.h \
b/messagelib/messageviewer/src/viewer/objecttreeviewersource.h similarity index 100%
rename from messageviewer/src/viewer/objecttreeviewersource.h
rename to messagelib/messageviewer/src/viewer/objecttreeviewersource.h
diff --git a/messageviewer/src/viewer/partmetadata.h \
b/messagelib/messageviewer/src/viewer/partmetadata.h similarity index 100%
rename from messageviewer/src/viewer/partmetadata.h
rename to messagelib/messageviewer/src/viewer/partmetadata.h
diff --git a/messageviewer/src/viewer/partnodebodypart.cpp \
b/messagelib/messageviewer/src/viewer/partnodebodypart.cpp similarity index 100%
rename from messageviewer/src/viewer/partnodebodypart.cpp
rename to messagelib/messageviewer/src/viewer/partnodebodypart.cpp
diff --git a/messageviewer/src/viewer/partnodebodypart.h \
b/messagelib/messageviewer/src/viewer/partnodebodypart.h similarity index 100%
rename from messageviewer/src/viewer/partnodebodypart.h
rename to messagelib/messageviewer/src/viewer/partnodebodypart.h
diff --git a/messageviewer/src/viewer/pluginloader.h \
b/messagelib/messageviewer/src/viewer/pluginloader.h similarity index 100%
rename from messageviewer/src/viewer/pluginloader.h
rename to messagelib/messageviewer/src/viewer/pluginloader.h
diff --git a/messageviewer/src/viewer/pluginloaderbase.cpp \
b/messagelib/messageviewer/src/viewer/pluginloaderbase.cpp similarity index 100%
rename from messageviewer/src/viewer/pluginloaderbase.cpp
rename to messagelib/messageviewer/src/viewer/pluginloaderbase.cpp
diff --git a/messageviewer/src/viewer/pluginloaderbase.h \
b/messagelib/messageviewer/src/viewer/pluginloaderbase.h similarity index 100%
rename from messageviewer/src/viewer/pluginloaderbase.h
rename to messagelib/messageviewer/src/viewer/pluginloaderbase.h
diff --git a/messageviewer/src/viewer/stl_util.h \
b/messagelib/messageviewer/src/viewer/stl_util.h similarity index 100%
rename from messageviewer/src/viewer/stl_util.h
rename to messagelib/messageviewer/src/viewer/stl_util.h
diff --git a/messageviewer/src/viewer/urlhandlermanager.cpp \
b/messagelib/messageviewer/src/viewer/urlhandlermanager.cpp similarity index 100%
rename from messageviewer/src/viewer/urlhandlermanager.cpp
rename to messagelib/messageviewer/src/viewer/urlhandlermanager.cpp
diff --git a/messageviewer/src/viewer/urlhandlermanager.h \
b/messagelib/messageviewer/src/viewer/urlhandlermanager.h similarity index 100%
rename from messageviewer/src/viewer/urlhandlermanager.h
rename to messagelib/messageviewer/src/viewer/urlhandlermanager.h
diff --git a/messageviewer/src/viewer/viewer.cpp \
b/messagelib/messageviewer/src/viewer/viewer.cpp similarity index 100%
rename from messageviewer/src/viewer/viewer.cpp
rename to messagelib/messageviewer/src/viewer/viewer.cpp
diff --git a/messageviewer/src/viewer/viewer.h \
b/messagelib/messageviewer/src/viewer/viewer.h similarity index 100%
rename from messageviewer/src/viewer/viewer.h
rename to messagelib/messageviewer/src/viewer/viewer.h
diff --git a/messageviewer/src/viewer/viewer_p.cpp \
b/messagelib/messageviewer/src/viewer/viewer_p.cpp similarity index 100%
rename from messageviewer/src/viewer/viewer_p.cpp
rename to messagelib/messageviewer/src/viewer/viewer_p.cpp
diff --git a/messageviewer/src/viewer/viewer_p.h \
b/messagelib/messageviewer/src/viewer/viewer_p.h similarity index 100%
rename from messageviewer/src/viewer/viewer_p.h
rename to messagelib/messageviewer/src/viewer/viewer_p.h
diff --git a/messageviewer/src/viewerplugins/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/CMakeLists.txt similarity index 100%
rename from messageviewer/src/viewerplugins/CMakeLists.txt
rename to messagelib/messageviewer/src/viewerplugins/CMakeLists.txt
diff --git a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/autotests/CMakeLists.txt similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/CMakeLists.txt
rename to messagelib/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
diff --git a/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/eventedittest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/eventedittest.cpp
rename to messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.cpp
diff --git a/messageviewer/src/viewerplugins/autotests/eventedittest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.h similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/eventedittest.h
rename to messagelib/messageviewer/src/viewerplugins/autotests/eventedittest.h
diff --git a/messageviewer/src/viewerplugins/autotests/noteedittest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/noteedittest.cpp
rename to messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.cpp
diff --git a/messageviewer/src/viewerplugins/autotests/noteedittest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.h similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/noteedittest.h
rename to messagelib/messageviewer/src/viewerplugins/autotests/noteedittest.h
diff --git a/messageviewer/src/viewerplugins/autotests/todoedittest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/todoedittest.cpp
rename to messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.cpp
diff --git a/messageviewer/src/viewerplugins/autotests/todoedittest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.h similarity \
index 100% rename from messageviewer/src/viewerplugins/autotests/todoedittest.h
rename to messagelib/messageviewer/src/viewerplugins/autotests/todoedittest.h
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp
rename to messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreateeventtest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatenotetest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugincreatetodotest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerpluginmanagertest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp
rename to messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintoolmanagertest.h
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.cpp
                
diff --git a/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h \
b/messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h rename to \
                messagelib/messageviewer/src/viewerplugins/autotests/viewerplugintranslatortest.h
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp
rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h \
similarity index 100% rename from \
messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h rename to \
                messagelib/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget.h
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp \
similarity index 100% rename from \
messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp rename to \
                messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/eventedit.h \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.h similarity \
index 100% rename from messageviewer/src/viewerplugins/createeventplugin/eventedit.h
rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/eventedit.h
diff --git a/messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop
 rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/messageviewer_createeventplugin.desktop
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.cpp
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h
 rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateevent.h
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
                
diff --git a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h \
b/messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h
 rename to messagelib/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.h
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/viewerplugins/createnoteplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop
 similarity index 100%
rename from messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop
 rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp
rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.cpp
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/noteedit.h \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.h similarity \
index 100% rename from messageviewer/src/viewerplugins/createnoteplugin/noteedit.h
rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/noteedit.h
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.cpp
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h
rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenote.h
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
                
diff --git a/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h \
b/messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h
 rename to messagelib/messageviewer/src/viewerplugins/createnoteplugin/viewerplugincreatenoteinterface.h
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop
 similarity index 100%
rename from messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop
 rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/messageviewer_createtodoplugin.desktop
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp
rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h similarity \
index 100% rename from messageviewer/src/viewerplugins/createtodoplugin/todoedit.h
rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h
rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodo.h
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
 rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
                
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h \
b/messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h
 rename to messagelib/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.h
                
diff --git a/messageviewer/src/viewerplugins/tests/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/tests/CMakeLists.txt similarity index \
100% rename from messageviewer/src/viewerplugins/tests/CMakeLists.txt
rename to messagelib/messageviewer/src/viewerplugins/tests/CMakeLists.txt
diff --git a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp \
b/messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
rename to messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
diff --git a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h \
b/messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h similarity \
index 100% rename from messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
rename to messagelib/messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
diff --git a/messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt \
similarity index 100% rename from \
messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt rename to \
                messagelib/messageviewer/src/viewerplugins/translatorplugin/CMakeLists.txt
                
diff --git a/messageviewer/src/viewerplugins/translatorplugin/messageviewer_translatorplugin.desktop \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/messageviewer_translatorplugin.desktop
 similarity index 100%
rename from messageviewer/src/viewerplugins/translatorplugin/messageviewer_translatorplugin.desktop
 rename to messagelib/messageviewer/src/viewerplugins/translatorplugin/messageviewer_translatorplugin.desktop
                
diff --git a/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp
 rename to messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.cpp
                
diff --git a/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h
rename to messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslator.h
                
diff --git a/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp
 similarity index 100%
rename from messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp
 rename to messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.cpp
                
diff --git a/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h \
b/messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h
 similarity index 100%
rename from messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h
 rename to messagelib/messageviewer/src/viewerplugins/translatorplugin/viewerplugintranslatorinterface.h
                
diff --git a/messageviewer/src/viewerplugins/viewerplugin.cpp \
b/messagelib/messageviewer/src/viewerplugins/viewerplugin.cpp similarity index 100%
rename from messageviewer/src/viewerplugins/viewerplugin.cpp
rename to messagelib/messageviewer/src/viewerplugins/viewerplugin.cpp
diff --git a/messageviewer/src/viewerplugins/viewerplugin.h \
b/messagelib/messageviewer/src/viewerplugins/viewerplugin.h similarity index 100%
rename from messageviewer/src/viewerplugins/viewerplugin.h
rename to messagelib/messageviewer/src/viewerplugins/viewerplugin.h
diff --git a/messageviewer/src/viewerplugins/viewerplugininterface.cpp \
b/messagelib/messageviewer/src/viewerplugins/viewerplugininterface.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/viewerplugininterface.cpp
rename to messagelib/messageviewer/src/viewerplugins/viewerplugininterface.cpp
diff --git a/messageviewer/src/viewerplugins/viewerplugininterface.h \
b/messagelib/messageviewer/src/viewerplugins/viewerplugininterface.h similarity index \
100% rename from messageviewer/src/viewerplugins/viewerplugininterface.h
rename to messagelib/messageviewer/src/viewerplugins/viewerplugininterface.h
diff --git a/messageviewer/src/viewerplugins/viewerpluginmanager.cpp \
b/messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.cpp similarity index \
100% rename from messageviewer/src/viewerplugins/viewerpluginmanager.cpp
rename to messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.cpp
diff --git a/messageviewer/src/viewerplugins/viewerpluginmanager.h \
b/messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.h similarity index \
100% rename from messageviewer/src/viewerplugins/viewerpluginmanager.h
rename to messagelib/messageviewer/src/viewerplugins/viewerpluginmanager.h
diff --git a/messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp \
b/messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp similarity \
index 100% rename from messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
rename to messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
diff --git a/messageviewer/src/viewerplugins/viewerplugintoolmanager.h \
b/messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.h similarity \
index 100% rename from messageviewer/src/viewerplugins/viewerplugintoolmanager.h
rename to messagelib/messageviewer/src/viewerplugins/viewerplugintoolmanager.h
diff --git a/messageviewer/src/widgets/attachmentdialog.cpp \
b/messagelib/messageviewer/src/widgets/attachmentdialog.cpp similarity index 100%
rename from messageviewer/src/widgets/attachmentdialog.cpp
rename to messagelib/messageviewer/src/widgets/attachmentdialog.cpp
diff --git a/messageviewer/src/widgets/attachmentdialog.h \
b/messagelib/messageviewer/src/widgets/attachmentdialog.h similarity index 100%
rename from messageviewer/src/widgets/attachmentdialog.h
rename to messagelib/messageviewer/src/widgets/attachmentdialog.h
diff --git a/messageviewer/src/widgets/configurewidget.cpp \
b/messagelib/messageviewer/src/widgets/configurewidget.cpp similarity index 100%
rename from messageviewer/src/widgets/configurewidget.cpp
rename to messagelib/messageviewer/src/widgets/configurewidget.cpp
diff --git a/messageviewer/src/widgets/configurewidget.h \
b/messagelib/messageviewer/src/widgets/configurewidget.h similarity index 100%
rename from messageviewer/src/widgets/configurewidget.h
rename to messagelib/messageviewer/src/widgets/configurewidget.h
diff --git a/messageviewer/src/widgets/customheadersettingdialog.cpp \
b/messagelib/messageviewer/src/widgets/customheadersettingdialog.cpp similarity index \
100% rename from messageviewer/src/widgets/customheadersettingdialog.cpp
rename to messagelib/messageviewer/src/widgets/customheadersettingdialog.cpp
diff --git a/messageviewer/src/widgets/customheadersettingdialog.h \
b/messagelib/messageviewer/src/widgets/customheadersettingdialog.h similarity index \
100% rename from messageviewer/src/widgets/customheadersettingdialog.h
rename to messagelib/messageviewer/src/widgets/customheadersettingdialog.h
diff --git a/messageviewer/src/widgets/customheadersettingwidget.cpp \
b/messagelib/messageviewer/src/widgets/customheadersettingwidget.cpp similarity index \
100% rename from messageviewer/src/widgets/customheadersettingwidget.cpp
rename to messagelib/messageviewer/src/widgets/customheadersettingwidget.cpp
diff --git a/messageviewer/src/widgets/customheadersettingwidget.h \
b/messagelib/messageviewer/src/widgets/customheadersettingwidget.h similarity index \
100% rename from messageviewer/src/widgets/customheadersettingwidget.h
rename to messagelib/messageviewer/src/widgets/customheadersettingwidget.h
diff --git a/messageviewer/src/widgets/htmlstatusbar.cpp \
b/messagelib/messageviewer/src/widgets/htmlstatusbar.cpp similarity index 100%
rename from messageviewer/src/widgets/htmlstatusbar.cpp
rename to messagelib/messageviewer/src/widgets/htmlstatusbar.cpp
diff --git a/messageviewer/src/widgets/htmlstatusbar.h \
b/messagelib/messageviewer/src/widgets/htmlstatusbar.h similarity index 100%
rename from messageviewer/src/widgets/htmlstatusbar.h
rename to messagelib/messageviewer/src/widgets/htmlstatusbar.h
diff --git a/messageviewer/src/widgets/invitationsettings.cpp \
b/messagelib/messageviewer/src/widgets/invitationsettings.cpp similarity index 100%
rename from messageviewer/src/widgets/invitationsettings.cpp
rename to messagelib/messageviewer/src/widgets/invitationsettings.cpp
diff --git a/messageviewer/src/widgets/invitationsettings.h \
b/messagelib/messageviewer/src/widgets/invitationsettings.h similarity index 100%
rename from messageviewer/src/widgets/invitationsettings.h
rename to messagelib/messageviewer/src/widgets/invitationsettings.h
diff --git a/messageviewer/src/widgets/mailsourceviewer.cpp \
b/messagelib/messageviewer/src/widgets/mailsourceviewer.cpp similarity index 100%
rename from messageviewer/src/widgets/mailsourceviewer.cpp
rename to messagelib/messageviewer/src/widgets/mailsourceviewer.cpp
diff --git a/messageviewer/src/widgets/mailsourceviewer.h \
b/messagelib/messageviewer/src/widgets/mailsourceviewer.h similarity index 100%
rename from messageviewer/src/widgets/mailsourceviewer.h
rename to messagelib/messageviewer/src/widgets/mailsourceviewer.h
diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp \
b/messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp similarity \
index 100% rename from messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
rename to messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h \
b/messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h similarity \
index 100% rename from messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
rename to messagelib/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
diff --git a/messageviewer/src/widgets/openattachmentfolderwidget.cpp \
b/messagelib/messageviewer/src/widgets/openattachmentfolderwidget.cpp similarity \
index 100% rename from messageviewer/src/widgets/openattachmentfolderwidget.cpp
rename to messagelib/messageviewer/src/widgets/openattachmentfolderwidget.cpp
diff --git a/messageviewer/src/widgets/openattachmentfolderwidget.h \
b/messagelib/messageviewer/src/widgets/openattachmentfolderwidget.h similarity index \
100% rename from messageviewer/src/widgets/openattachmentfolderwidget.h
rename to messagelib/messageviewer/src/widgets/openattachmentfolderwidget.h
diff --git a/messageviewer/src/widgets/printingsettings.cpp \
b/messagelib/messageviewer/src/widgets/printingsettings.cpp similarity index 100%
rename from messageviewer/src/widgets/printingsettings.cpp
rename to messagelib/messageviewer/src/widgets/printingsettings.cpp
diff --git a/messageviewer/src/widgets/printingsettings.h \
b/messagelib/messageviewer/src/widgets/printingsettings.h similarity index 100%
rename from messageviewer/src/widgets/printingsettings.h
rename to messagelib/messageviewer/src/widgets/printingsettings.h
diff --git a/messageviewer/src/widgets/vcardviewer.cpp \
b/messagelib/messageviewer/src/widgets/vcardviewer.cpp similarity index 100%
rename from messageviewer/src/widgets/vcardviewer.cpp
rename to messagelib/messageviewer/src/widgets/vcardviewer.cpp
diff --git a/messageviewer/src/widgets/vcardviewer.h \
b/messagelib/messageviewer/src/widgets/vcardviewer.h similarity index 100%
rename from messageviewer/src/widgets/vcardviewer.h
rename to messagelib/messageviewer/src/widgets/vcardviewer.h
diff --git a/messageviewer/src/widgets/zoomactionmenu.cpp \
b/messagelib/messageviewer/src/widgets/zoomactionmenu.cpp similarity index 100%
rename from messageviewer/src/widgets/zoomactionmenu.cpp
rename to messagelib/messageviewer/src/widgets/zoomactionmenu.cpp
diff --git a/messageviewer/src/widgets/zoomactionmenu.h \
b/messagelib/messageviewer/src/widgets/zoomactionmenu.h similarity index 100%
rename from messageviewer/src/widgets/zoomactionmenu.h
rename to messagelib/messageviewer/src/widgets/zoomactionmenu.h
diff --git a/messageviewer/tests/CMakeLists.txt \
b/messagelib/messageviewer/tests/CMakeLists.txt similarity index 100%
rename from messageviewer/tests/CMakeLists.txt
rename to messagelib/messageviewer/tests/CMakeLists.txt
diff --git a/messageviewer/tests/viewertest_gui.cpp \
b/messagelib/messageviewer/tests/viewertest_gui.cpp similarity index 100%
rename from messageviewer/tests/viewertest_gui.cpp
rename to messagelib/messageviewer/tests/viewertest_gui.cpp
diff --git a/templateparser/.krazy b/messagelib/templateparser/.krazy
similarity index 100%
rename from templateparser/.krazy
rename to messagelib/templateparser/.krazy
diff --git a/templateparser/CMakeLists.txt b/messagelib/templateparser/CMakeLists.txt
similarity index 94%
rename from templateparser/CMakeLists.txt
rename to messagelib/templateparser/CMakeLists.txt
index 8dc69a6..b1b9b52 100644
--- a/templateparser/CMakeLists.txt
+++ b/messagelib/templateparser/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
 project(TemplateParser)
 
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${TemplateParser_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 # ECM setup
 find_package(ECM 5.16.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${TemplateParser_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
@@ -38,10 +38,9 @@ find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG \
REQUIRED)  find_package(KF5Libkleo ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5WebKit ${KF5_VERSION} CONFIG REQUIRED)
 ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX TEMPLATEPARSER
                         VERSION_HEADER \
                "${CMAKE_CURRENT_BINARY_DIR}/templateparser_version.h"
                         PACKAGE_VERSION_FILE \
                "${CMAKE_CURRENT_BINARY_DIR}/KF5TemplateParserConfigVersion.cmake"
diff --git a/templateparser/KF5TemplateParserConfig.cmake.in \
b/messagelib/templateparser/KF5TemplateParserConfig.cmake.in similarity index 100%
rename from templateparser/KF5TemplateParserConfig.cmake.in
rename to messagelib/templateparser/KF5TemplateParserConfig.cmake.in
diff --git a/templateparser/autotests/CMakeLists.txt \
b/messagelib/templateparser/autotests/CMakeLists.txt similarity index 100%
rename from templateparser/autotests/CMakeLists.txt
rename to messagelib/templateparser/autotests/CMakeLists.txt
diff --git a/templateparser/autotests/customtemplatesmenutest.cpp \
b/messagelib/templateparser/autotests/customtemplatesmenutest.cpp similarity index \
100% rename from templateparser/autotests/customtemplatesmenutest.cpp
rename to messagelib/templateparser/autotests/customtemplatesmenutest.cpp
diff --git a/templateparser/autotests/customtemplatesmenutest.h \
b/messagelib/templateparser/autotests/customtemplatesmenutest.h similarity index 100%
rename from templateparser/autotests/customtemplatesmenutest.h
rename to messagelib/templateparser/autotests/customtemplatesmenutest.h
diff --git a/templateparser/autotests/data/insert-file.txt \
b/messagelib/templateparser/autotests/data/insert-file.txt similarity index 100%
rename from templateparser/autotests/data/insert-file.txt
rename to messagelib/templateparser/autotests/data/insert-file.txt
diff --git a/templateparser/autotests/data/plain-message.mbox \
b/messagelib/templateparser/autotests/data/plain-message.mbox similarity index 100%
rename from templateparser/autotests/data/plain-message.mbox
rename to messagelib/templateparser/autotests/data/plain-message.mbox
diff --git a/templateparser/autotests/data/plain-message.mbox.html \
b/messagelib/templateparser/autotests/data/plain-message.mbox.html similarity index \
100% rename from templateparser/autotests/data/plain-message.mbox.html
rename to messagelib/templateparser/autotests/data/plain-message.mbox.html
diff --git a/templateparser/autotests/templateparsertest.cpp \
b/messagelib/templateparser/autotests/templateparsertest.cpp similarity index 100%
rename from templateparser/autotests/templateparsertest.cpp
rename to messagelib/templateparser/autotests/templateparsertest.cpp
diff --git a/templateparser/autotests/templateparsertest.h \
b/messagelib/templateparser/autotests/templateparsertest.h similarity index 100%
rename from templateparser/autotests/templateparsertest.h
rename to messagelib/templateparser/autotests/templateparsertest.h
diff --git a/messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake \
b/messagelib/templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake similarity \
index 100% rename from messagecomposer/cmake/modules/kdepim_add_gpg_crypto_test.cmake
rename to messagelib/templateparser/cmake/modules/kdepim_add_gpg_crypto_test.cmake
diff --git a/messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
b/messagelib/templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake \
similarity index 100% rename from \
messagecomposer/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake rename to \
                messagelib/templateparser/cmake/modules/kdepim_generate_crypto_test_wrapper.cmake
                
diff --git a/templateparser/src/CMakeLists.txt \
b/messagelib/templateparser/src/CMakeLists.txt similarity index 98%
rename from templateparser/src/CMakeLists.txt
rename to messagelib/templateparser/src/CMakeLists.txt
index c8f6135..24776fc 100644
--- a/templateparser/src/CMakeLists.txt
+++ b/messagelib/templateparser/src/CMakeLists.txt
@@ -88,7 +88,7 @@ ecm_generate_pri_file(BASE_NAME TemplateParser
 
 
 install(TARGETS KF5TemplateParser EXPORT KF5TemplateParserTargets \
                ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK})
-if(${CMAKE_SOURCE_DIR} STREQUAL ${TemplateParser_SOURCE_DIR})
+if(${CMAKE_SOURCE_DIR} STREQUAL ${Messagelib_SOURCE_DIR})
 
 
 install(FILES
diff --git a/templateparser/src/Messages.sh \
b/messagelib/templateparser/src/Messages.sh similarity index 100%
rename from templateparser/src/Messages.sh
rename to messagelib/templateparser/src/Messages.sh
diff --git a/templateparser/src/customtemplates.cpp \
b/messagelib/templateparser/src/customtemplates.cpp similarity index 100%
rename from templateparser/src/customtemplates.cpp
rename to messagelib/templateparser/src/customtemplates.cpp
diff --git a/templateparser/src/customtemplates.h \
b/messagelib/templateparser/src/customtemplates.h similarity index 100%
rename from templateparser/src/customtemplates.h
rename to messagelib/templateparser/src/customtemplates.h
diff --git a/templateparser/src/customtemplatesmenu.cpp \
b/messagelib/templateparser/src/customtemplatesmenu.cpp similarity index 100%
rename from templateparser/src/customtemplatesmenu.cpp
rename to messagelib/templateparser/src/customtemplatesmenu.cpp
diff --git a/templateparser/src/customtemplatesmenu.h \
b/messagelib/templateparser/src/customtemplatesmenu.h similarity index 100%
rename from templateparser/src/customtemplatesmenu.h
rename to messagelib/templateparser/src/customtemplatesmenu.h
diff --git a/templateparser/src/defaulttemplates.cpp \
b/messagelib/templateparser/src/defaulttemplates.cpp similarity index 100%
rename from templateparser/src/defaulttemplates.cpp
rename to messagelib/templateparser/src/defaulttemplates.cpp
diff --git a/templateparser/src/defaulttemplates.h \
b/messagelib/templateparser/src/defaulttemplates.h similarity index 100%
rename from templateparser/src/defaulttemplates.h
rename to messagelib/templateparser/src/defaulttemplates.h
diff --git a/templateparser/src/settings/customtemplates_kfg.kcfg \
b/messagelib/templateparser/src/settings/customtemplates_kfg.kcfg similarity index \
100% rename from templateparser/src/settings/customtemplates_kfg.kcfg
rename to messagelib/templateparser/src/settings/customtemplates_kfg.kcfg
diff --git a/templateparser/src/settings/customtemplates_kfg.kcfgc \
b/messagelib/templateparser/src/settings/customtemplates_kfg.kcfgc similarity index \
100% rename from templateparser/src/settings/customtemplates_kfg.kcfgc
rename to messagelib/templateparser/src/settings/customtemplates_kfg.kcfgc
diff --git a/templateparser/src/settings/globalsettings_templateparser.kcfgc \
b/messagelib/templateparser/src/settings/globalsettings_templateparser.kcfgc \
similarity index 100% rename from \
templateparser/src/settings/globalsettings_templateparser.kcfgc rename to \
                messagelib/templateparser/src/settings/globalsettings_templateparser.kcfgc
                
diff --git a/templateparser/src/settings/templateparser.kcfg \
b/messagelib/templateparser/src/settings/templateparser.kcfg similarity index 100%
rename from templateparser/src/settings/templateparser.kcfg
rename to messagelib/templateparser/src/settings/templateparser.kcfg
diff --git a/templateparser/src/settings/templatesconfiguration_kfg.kcfg \
b/messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfg similarity \
index 100% rename from templateparser/src/settings/templatesconfiguration_kfg.kcfg
rename to messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfg
diff --git a/templateparser/src/settings/templatesconfiguration_kfg.kcfgc \
b/messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfgc similarity \
index 100% rename from templateparser/src/settings/templatesconfiguration_kfg.kcfgc
rename to messagelib/templateparser/src/settings/templatesconfiguration_kfg.kcfgc
diff --git a/templateparser/src/templateparser.cpp \
b/messagelib/templateparser/src/templateparser.cpp similarity index 100%
rename from templateparser/src/templateparser.cpp
rename to messagelib/templateparser/src/templateparser.cpp
diff --git a/templateparser/src/templateparser.h \
b/messagelib/templateparser/src/templateparser.h similarity index 100%
rename from templateparser/src/templateparser.h
rename to messagelib/templateparser/src/templateparser.h
diff --git a/templateparser/src/templatesconfiguration.cpp \
b/messagelib/templateparser/src/templatesconfiguration.cpp similarity index 100%
rename from templateparser/src/templatesconfiguration.cpp
rename to messagelib/templateparser/src/templatesconfiguration.cpp
diff --git a/templateparser/src/templatesconfiguration.h \
b/messagelib/templateparser/src/templatesconfiguration.h similarity index 100%
rename from templateparser/src/templatesconfiguration.h
rename to messagelib/templateparser/src/templatesconfiguration.h
diff --git a/templateparser/src/templatesinsertcommand.cpp \
b/messagelib/templateparser/src/templatesinsertcommand.cpp similarity index 100%
rename from templateparser/src/templatesinsertcommand.cpp
rename to messagelib/templateparser/src/templatesinsertcommand.cpp
diff --git a/templateparser/src/templatesinsertcommand.h \
b/messagelib/templateparser/src/templatesinsertcommand.h similarity index 100%
rename from templateparser/src/templatesinsertcommand.h
rename to messagelib/templateparser/src/templatesinsertcommand.h
diff --git a/templateparser/src/templatessyntaxhighlighterrules.cpp \
b/messagelib/templateparser/src/templatessyntaxhighlighterrules.cpp similarity index \
100% rename from templateparser/src/templatessyntaxhighlighterrules.cpp
rename to messagelib/templateparser/src/templatessyntaxhighlighterrules.cpp
diff --git a/templateparser/src/templatessyntaxhighlighterrules.h \
b/messagelib/templateparser/src/templatessyntaxhighlighterrules.h similarity index \
100% rename from templateparser/src/templatessyntaxhighlighterrules.h
rename to messagelib/templateparser/src/templatessyntaxhighlighterrules.h
diff --git a/templateparser/src/templatestextedit.cpp \
b/messagelib/templateparser/src/templatestextedit.cpp similarity index 100%
rename from templateparser/src/templatestextedit.cpp
rename to messagelib/templateparser/src/templatestextedit.cpp
diff --git a/templateparser/src/templatestextedit.h \
b/messagelib/templateparser/src/templatestextedit.h similarity index 100%
rename from templateparser/src/templatestextedit.h
rename to messagelib/templateparser/src/templatestextedit.h
diff --git a/templateparser/src/templatestexteditor.cpp \
b/messagelib/templateparser/src/templatestexteditor.cpp similarity index 100%
rename from templateparser/src/templatestexteditor.cpp
rename to messagelib/templateparser/src/templatestexteditor.cpp
diff --git a/templateparser/src/templatestexteditor.h \
b/messagelib/templateparser/src/templatestexteditor.h similarity index 100%
rename from templateparser/src/templatestexteditor.h
rename to messagelib/templateparser/src/templatestexteditor.h
diff --git a/templateparser/src/templatesutil.cpp \
b/messagelib/templateparser/src/templatesutil.cpp similarity index 100%
rename from templateparser/src/templatesutil.cpp
rename to messagelib/templateparser/src/templatesutil.cpp
diff --git a/templateparser/src/templatesutil.h \
b/messagelib/templateparser/src/templatesutil.h similarity index 100%
rename from templateparser/src/templatesutil.h
rename to messagelib/templateparser/src/templatesutil.h
diff --git a/templateparser/src/ui/customtemplates_base.ui \
b/messagelib/templateparser/src/ui/customtemplates_base.ui similarity index 100%
rename from templateparser/src/ui/customtemplates_base.ui
rename to messagelib/templateparser/src/ui/customtemplates_base.ui
diff --git a/templateparser/src/ui/templatesconfiguration_base.ui \
b/messagelib/templateparser/src/ui/templatesconfiguration_base.ui similarity index \
100% rename from templateparser/src/ui/templatesconfiguration_base.ui
rename to messagelib/templateparser/src/ui/templatesconfiguration_base.ui
diff --git a/templateparser/tests/CMakeLists.txt \
b/messagelib/templateparser/tests/CMakeLists.txt similarity index 100%
rename from templateparser/tests/CMakeLists.txt
rename to messagelib/templateparser/tests/CMakeLists.txt
diff --git a/templateparser/tests/templateconfigurewidget_gui.cpp \
b/messagelib/templateparser/tests/templateconfigurewidget_gui.cpp similarity index \
100% rename from templateparser/tests/templateconfigurewidget_gui.cpp
rename to messagelib/templateparser/tests/templateconfigurewidget_gui.cpp
diff --git a/templateparser/tests/templateconfigurewidget_gui.h \
b/messagelib/templateparser/tests/templateconfigurewidget_gui.h similarity index 100%
rename from templateparser/tests/templateconfigurewidget_gui.h
rename to messagelib/templateparser/tests/templateconfigurewidget_gui.h
diff --git a/templateparser/tests/templateeditor_gui.cpp \
b/messagelib/templateparser/tests/templateeditor_gui.cpp similarity index 100%
rename from templateparser/tests/templateeditor_gui.cpp
rename to messagelib/templateparser/tests/templateeditor_gui.cpp
diff --git a/templateparser/tests/templateeditor_gui.h \
b/messagelib/templateparser/tests/templateeditor_gui.h similarity index 100%
rename from templateparser/tests/templateeditor_gui.h
rename to messagelib/templateparser/tests/templateeditor_gui.h


[prev in list] [next in list] [prev in thread] [next in thread]