18 files changed, 39 insertions, 6 deletions

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 07a5eb83..84b0fa05 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -32,10 +32,9 @@ endmacro(auto_tests)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
 install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
 
-install(DIRECTORY mailviewer/qml/ DESTINATION ${QML_INSTALL_DIR}/org/kube/mailviewer)
-
 install_component(mail)
 install_component(accounts)
+install_component(mailviewer)
 
 include(${CMAKE_SOURCE_DIR}/KF5KirigamiMacros.cmake)
 kirigami_package_breeze_icons(ICONS applications-graphics view-list-icons folder-sync view-list-details configure document-edit dialog-cancel document-decrypt mail-reply-sender bookmarks folder)
diff --git a/components/mailviewer/qml/EmbededPart.qml b/components/mailviewer/contents/ui/EmbededPart.qml
index 8921ab6f..8921ab6f 100644
--- a/components/mailviewer/qml/EmbededPart.qml
+++ b/components/mailviewer/contents/ui/EmbededPart.qml
diff --git a/components/mailviewer/qml/EncryptionPart.qml b/components/mailviewer/contents/ui/EncryptionPart.qml
index 058c9af7..058c9af7 100644
--- a/components/mailviewer/qml/EncryptionPart.qml
+++ b/components/mailviewer/contents/ui/EncryptionPart.qml
diff --git a/components/mailviewer/qml/GREEN.png b/components/mailviewer/contents/ui/GREEN.png
index 60f8e10d..60f8e10d 100644
--- a/components/mailviewer/qml/GREEN.png
+++ b/components/mailviewer/contents/ui/GREEN.png
diff --git a/components/mailviewer/qml/GREY.png b/components/mailviewer/contents/ui/GREY.png
index 146e8927..146e8927 100644
--- a/components/mailviewer/qml/GREY.png
+++ b/components/mailviewer/contents/ui/GREY.png
diff --git a/components/mailviewer/qml/HtmlContent.qml b/components/mailviewer/contents/ui/HtmlContent.qml
index 4fc694f9..4fc694f9 100644
--- a/components/mailviewer/qml/HtmlContent.qml
+++ b/components/mailviewer/contents/ui/HtmlContent.qml
diff --git a/components/mailviewer/qml/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index e0e65c49..e0e65c49 100644
--- a/components/mailviewer/qml/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
diff --git a/components/mailviewer/qml/MailPart.qml b/components/mailviewer/contents/ui/MailPart.qml
index 30bf1ee0..30bf1ee0 100644
--- a/components/mailviewer/qml/MailPart.qml
+++ b/components/mailviewer/contents/ui/MailPart.qml
diff --git a/components/mailviewer/qml/MailViewer.qml b/components/mailviewer/contents/ui/MailViewer.qml
index 0f7efca2..0f7efca2 100644
--- a/components/mailviewer/qml/MailViewer.qml
+++ b/components/mailviewer/contents/ui/MailViewer.qml
diff --git a/components/mailviewer/qml/PURPLE.png b/components/mailviewer/contents/ui/PURPLE.png
index 5ea1eda2..5ea1eda2 100644
--- a/components/mailviewer/qml/PURPLE.png
+++ b/components/mailviewer/contents/ui/PURPLE.png
diff --git a/components/mailviewer/qml/RED.png b/components/mailviewer/contents/ui/RED.png
index 5bb547e2..5bb547e2 100644
--- a/components/mailviewer/qml/RED.png
+++ b/components/mailviewer/contents/ui/RED.png
diff --git a/components/mailviewer/qml/SignaturePart.qml b/components/mailviewer/contents/ui/SignaturePart.qml
index 0a2fe525..0a2fe525 100644
--- a/components/mailviewer/qml/SignaturePart.qml
+++ b/components/mailviewer/contents/ui/SignaturePart.qml
diff --git a/components/mailviewer/qml/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml
index d3ae80f9..d3ae80f9 100644
--- a/components/mailviewer/qml/TextContent.qml
+++ b/components/mailviewer/contents/ui/TextContent.qml
diff --git a/components/mailviewer/qml/YELLOW.png b/components/mailviewer/contents/ui/YELLOW.png
index db629e35..db629e35 100644
--- a/components/mailviewer/qml/YELLOW.png
+++ b/components/mailviewer/contents/ui/YELLOW.png
diff --git a/components/mailviewer/contents/ui/main.qml b/components/mailviewer/contents/ui/main.qml
new file mode 100644
index 00000000..e69dd5a2
--- /dev/null
+++ b/components/mailviewer/contents/ui/main.qml
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0 as Controls2
+
+Controls2.ApplicationWindow {
+    id: app
+    height: 900
+    width: 1500
+
+    MailViewer {
+        visible: true
+    }
+}
diff --git a/components/mailviewer/metadata.desktop b/components/mailviewer/metadata.desktop
new file mode 100644
index 00000000..c573ff89
--- /dev/null
+++ b/components/mailviewer/metadata.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kube Mailviewer
+X-KDE-PluginInfo-Name=org.kube.components.mailviewer
+Exec=kpackagelauncherqml -a org.kube.components.mailviewer
+X-Plasma-MainScript=ui/main.qml
+X-KDE-ServiceTypes=KPackage/GenericQML
+Icon=kmail2
+Type=Service
diff --git a/components/mailviewer/qml/.directory b/components/mailviewer/qml/.directory
deleted file mode 100644
index 5dfa7480..00000000
--- a/components/mailviewer/qml/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2016,11,5,15,10,37
-Version=3
diff --git a/components/mailviewer/qml/qmldir b/components/mailviewer/qmldir
index 0d87b779..0d87b779 100644
--- a/components/mailviewer/qml/qmldir
+++ b/components/mailviewer/qmldir