31 files changed, 795 insertions, 144 deletions

diff --git a/applications/kmail-mobile/Avatar.qml b/applications/kube-mail-mobile/Avatar.qml
index 3d3ffb2e..3d3ffb2e 100644
--- a/applications/kmail-mobile/Avatar.qml
+++ b/applications/kube-mail-mobile/Avatar.qml
diff --git a/applications/kmail-mobile/ColorPalette.qml b/applications/kube-mail-mobile/ColorPalette.qml
index c3993954..c3993954 100644
--- a/applications/kmail-mobile/ColorPalette.qml
+++ b/applications/kube-mail-mobile/ColorPalette.qml
diff --git a/applications/kmail-mobile/ComposerView.qml b/applications/kube-mail-mobile/ComposerView.qml
index d2f478b0..d2f478b0 100644
--- a/applications/kmail-mobile/ComposerView.qml
+++ b/applications/kube-mail-mobile/ComposerView.qml
diff --git a/applications/kmail-mobile/FolderListModel.qml b/applications/kube-mail-mobile/FolderListModel.qml
index 19093d51..19093d51 100644
--- a/applications/kmail-mobile/FolderListModel.qml
+++ b/applications/kube-mail-mobile/FolderListModel.qml
diff --git a/applications/kmail-mobile/FolderListView.qml b/applications/kube-mail-mobile/FolderListView.qml
index 1baa03b6..1baa03b6 100644
--- a/applications/kmail-mobile/FolderListView.qml
+++ b/applications/kube-mail-mobile/FolderListView.qml
diff --git a/applications/kmail-mobile/MailListModel.qml b/applications/kube-mail-mobile/MailListModel.qml
index 4b425b90..4b425b90 100644
--- a/applications/kmail-mobile/MailListModel.qml
+++ b/applications/kube-mail-mobile/MailListModel.qml
diff --git a/applications/kmail-mobile/MailListView.qml b/applications/kube-mail-mobile/MailListView.qml
index 869ce5e5..869ce5e5 100644
--- a/applications/kmail-mobile/MailListView.qml
+++ b/applications/kube-mail-mobile/MailListView.qml
diff --git a/applications/kmail-mobile/SingleMailView.qml b/applications/kube-mail-mobile/SingleMailView.qml
index ae184c4a..ae184c4a 100644
--- a/applications/kmail-mobile/SingleMailView.qml
+++ b/applications/kube-mail-mobile/SingleMailView.qml
diff --git a/applications/kmail-mobile/main.qml b/applications/kube-mail-mobile/main.qml
index 751c080c..751c080c 100644
--- a/applications/kmail-mobile/main.qml
+++ b/applications/kube-mail-mobile/main.qml
diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
new file mode 100644
index 00000000..d32ee7c6
--- /dev/null
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+ *
+ *   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 3 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.
+ *
+//import org.kde.kube.mail 1.0 as Mail
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Controls 1.3
+import QtQuick.Layouts 1.1
+
+Item {
+    id: root
+
+    ColumnLayout {
+
+        anchors.fill: parent
+
+        GridLayout {
+
+            columns: 2
+
+            Label {
+                text: "To"
+            }
+
+            TextField {
+                id: to
+
+                Layout.fillWidth: true
+            }
+
+            Label {
+                text: "Cc"
+            }
+
+            TextField {
+                id: cc
+
+                Layout.fillWidth: true
+            }
+
+            Label {
+                text: "Bcc"
+            }
+
+            TextField {
+                id: bcc
+
+                Layout.fillWidth: true
+            }
+        }
+
+        TextField {
+            id: subject
+
+            Layout.fillWidth: true
+
+            placeholderText: "Subject"
+        }
+
+        TextArea {
+            id: content
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+        }
+
+        RowLayout {
+            Button {
+                text: "Send"
+            }
+        }
+    }
+}
diff --git a/applications/kube-mail/package/contents/ui/main.qml b/applications/kube-mail/package/contents/ui/main.qml
index 33744157..ef37ae19 100644
--- a/applications/kube-mail/package/contents/ui/main.qml
+++ b/applications/kube-mail/package/contents/ui/main.qml
@@ -32,16 +32,16 @@ ApplicationWindow {
 
     visible: true
 
-    Action.ActionHandler {
-        actionId: "org.kde.kube.actions.mark-as-read"
-        function isReady(context) {
-            return context.mail ? true : false;
-        }
-
-        function handler(context) {
-            console.warn("Got message:", context.mail)
-        }
-    }
+    // Action.ActionHandler {
+    //     actionId: "org.kde.kube.actions.mark-as-read"
+    //     function isReady(context) {
+    //         return context.mail ? true : false;
+    //     }
+    //
+    //     function handler(context) {
+    //         console.warn("Got message:", context.mail)
+    //     }
+    // }
 
     Action.Context {
         id: "maillistcontext"
@@ -55,6 +55,12 @@ ApplicationWindow {
         context: maillistcontext
     }
 
+    Action.Action {
+        id: "deleteAction"
+        actionId: "org.kde.kube.actions.delete"
+        context: maillistcontext
+    }
+
     //UI
     toolBar: ToolBar {
 
@@ -62,48 +68,38 @@ ApplicationWindow {
             anchors.fill: parent
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-message-new"
-
                 text: "Compose"
+                enabled: false
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-mark-unread"
-                text: "Mark Unread"
+                text: "Mark As Read"
                 enabled: markAsReadAction.ready
-
                 onClicked: {
                     markAsReadAction.execute()
                 }
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "mail-mark-important"
                 text: "Mark Important"
-
+                enabled: false
                 onClicked: {
-                    mailList.markMailImportant(true)
                 }
             }
 
             PlasmaComponents.ToolButton {
-
                 height: parent.height
-
                 iconName: "edit-delete"
                 text: "Delete Mail"
-
+                enabled: deleteAction.ready
                 onClicked: {
-                    mailList.deleteMail()
+                    deleteAction.execute()
                 }
             }
         }
@@ -114,7 +110,6 @@ ApplicationWindow {
 
         FolderListView {
             id: folderListView
-
             width: unit.size * 55
             Layout.maximumWidth: unit.size * 150
             Layout.minimumWidth: unit.size * 30
@@ -123,7 +118,6 @@ ApplicationWindow {
         MailListView  {
             id: mailListView
             parentFolder: folderListView.currentFolder
-
             width: unit.size * 80
             Layout.maximumWidth: unit.size * 250
             Layout.minimumWidth: unit.size * 50
@@ -132,7 +126,6 @@ ApplicationWindow {
         SingleMailView {
             id: mailView
             mail: mailListView.currentMail
-
             Layout.fillWidth: true
         }
 
@@ -141,7 +134,6 @@ ApplicationWindow {
     //TODO find a better way to scale UI
     Item {
         id: unit
-
         property int size: 5
     }
 
diff --git a/docs/design.md b/docs/design.md
index e8a39915..38edde01 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -3,16 +3,17 @@
 ## Overview
 Kube is supposed to be a small and concise codebase that is easy to modify and evolve.
 
-It's following a reactive model, where in one direction we have controllers generating modifications, and in the other direction models updating themselves on changes.
+It's following a reactive model, where in one direction we have actions generating modifications, and in the other direction models updating themselves on changes.
 
 The overall architecture is split into three layers; Ui, Domain Logic and Infrastructure.
 
 ```
 +----------------------------+
-|      UI / Application      |
+|        UI Components       |
 +----------------------------+
 |                            |
 |        Domain Logic        |
+|        Actions/Models      |
 |                            |
 +--------------+------+------+
 |              |      |      |
@@ -21,9 +22,9 @@ The overall architecture is split into three layers; Ui, Domain Logic and Infras
 +--------------+------+------+
 ```
 
-The UI Layer consists of views (mostly written in QML), view-models (models that are view specific and potentially implement user interaction details), and the glue code to use various controllers from the interface. Different UI layers may exist for different form factors.
+The UI Layer consists of views (mostly written in QML), view-models (models that are view specific and potentially implement user interaction details), and the glue code to use various models and actions from the interface. Different UI layers may exist for different form factors.
 
-The domain logic layer holds the application state. It povides models to access data and controllers to act upon it. The domain logic is by definition Kube specific and not sharable with other applications, as it needs to be taylored exactly according to the requirements of Kube.
+The domain logic layer holds the application state. It povides models to access data and actions to act upon it. The domain logic is by definition Kube specific and not sharable with other applications, as it needs to be taylored exactly according to the requirements of Kube.
 
 The infrastructure layer provides:
 
@@ -32,20 +33,38 @@ The infrastructure layer provides:
 * Various functionality provided by libraries (email sending, ldap, iTip handling, iCal implementation (kcalcore), vCard implementation, ...)
 Various bits of the infrastructure layer may be exchanged on different platforms, to i.e. integrate into native infrastructure providers on a platform.
 
-Note: By using the onion architecture we ensure the infrastructure is exchangable just as well as the UI.
-Note: The domain objects might also be specified in Akonadi Next.
-
 ## UI / Application
-The UI / Application layer contains all the views, and their composition, that make up the application.
+The UI / Application layer contains all the view components, and their composition, that make up the application.
 All the interactions between the different components are defined here.
 
-### UI Component Interaction
-UI components will have to be able to:
+## Components
+The application consists of various application components. A component could be a maillist, an event-editor or the complete kube-mail application. Each component is instantiable on it's own, and has an API to interact with it. The API i.e. allows to set a folder for the maillist, or an event for the event-editor. Components can be nested (a component can instantiate another component)
+
+A component primarily is a QML UI.
+
+The QML UI is built on top of:
+
+* One or more models that are instantiated to provide the data.
+* Actions that are instantiated in QML.
+
+## Component interaction
+The application is made up of various nested components that often need to interact with each other.
+
+If we look at the example of the org.kube.mail component:
+1. The folderlist-component current-folder property is connected to maillist parentFolder property to display the mails of the currently selected folder.
+2. The "add-note" action might either switch to the org.kube.note application as currently displayed component, or it might just display a quick-note widget directly inline.
+
+The first usecase can be achieved by the parent component doing a property binding to connect the different components together as desired.
+
+The second usecase requires actions to interact with 'a' parent component, but without knowing with which one. Actions can thus be handled by ActionHandlers anywhere in the application.
 
-* Load certain views directly inline (e.g. load a calendar into a mail with an invitation, or a maileditor into the maillist)
-* Change the overall application state by i.e. triggering the calendar to show a certain date-range.
+This makes it possible for i.e. a maillist to display a note-widget directly inline, or letting the parent component handle the action to show a full note editor.
+If nothing handles the action, the root component (the shell)can switch to the note application component.
 
-This is ideally decoupled in a way that the provider of such a service can be replaced without changing the users of the service. Additionally it should be possible for external applications (such as a plasmoid), to load the same views, possibly through the same mechanism.
+## Third party users of components
+Since components are self contained and made available throuh the KPackage sytem, external applications can load fully functional Kube components.
+
+For example, the KDE calendar plasmoid could load the Kube Event Viewer component when available, and thus provide Kube's full functionality of that component, including all actions etc, without having to reimplement the Domain Logic (as is the case if only data access is provided through akonadi).
 
 ## Domain Logic
 
@@ -57,55 +76,58 @@ Models should always be reactive and configured with a query, so they are asynch
 
 By implementing everything according to that model we can later on achieve lazy-loading of properties and zero-copy (or at least close to zero-copy) directly from storage without modifying anything besides data access.
 
-### Controllers
-Use-case specific controllers are used to operate on the data. Controllers allow to completely separate the modifications from the view.
-Rather than splitting controllers by domain type (e.g. an email controller, or a calendar controller), we specifically write controllers for specific usecases (e.g. an email editor), that exposes all required actions. That way we ensure that the API's a UI is working with is always clear an consice, and that we have all domain logic captured in the domain logic layer, rather than the UI layer.
-Of course controllers will need to share functionality internally as soon as an action is available from more than one place.
+Models are self contained and have an API to set i.e. a query for what to load. Models can load data from anywhere. Typically models are implemented in C++ to interface with the rest of the system, but some models may also be implemented directly in QML.
 
-### Email Domain Logic
-* Folder list
-    * Folder List Controller
-        * Move mail to folder
-        * Move/Copy/Delete folder
-        * Synchronize folder
-    * Folder List Model
-        * Mixes akonadi next queries and subqueries (folder list with smart folders)
-        * name
-        * statistics
+### Actions
+An action represents something that can be done, such as "mark as read", "delete", "move somewhere", but also "show this mail" or "give me a composer to write a mail".
 
-* Mail list
-    * MailListController
-        * Mark as read
-        * Flag as important
-        * Move to trash
-    * MailListModel
-        * subject
-        * date
-        * sender
-        * folder
-    * ThreadModel
-        * thread leader (otherwise like maillist model)
-        * number of mails in thread
+An action has:
+* an id (i.e. org.kube.actions.make-as-read)
+* an active state (a property for the UI to know when the action can be triggered, that changes depending on the context)
+* an action context, which contains everything the action needs to execute.
+* an icon
+* a name
 
-* Mail Viewer
-    * MailViewController
-        * reply
-        * forward
-        * move to trash
-    * MailModel
-        * subject, date, sender, folder, content, attachments
+The action context contains the dataset the action works upon plus any additional information that is required. A mark-as-read action for instance only requires the mail-set to work on, while a tag-with action requires any entity (mail, event, ...) and a tag (unless there is one action per tag...).
+The action can, through property-binding, reevaluate its active state based on the currently set context that the UI continuously updates through property binding. Context objects can be shared by various actions.
 
-## Infrastructure
+#### Automatic action discovery
+While in many places explicit instantiation of actions is desirable, sometimes we may want to offer all available actions for a certain type. For this it should be possible to i.e. query for all actions that apply to a mail. That way it is possible to centrally add a new action that automatically becomes available everywhere. Note that this only works for actions that don't require an additional UI, since the components would have to embedd that somewhere.
+
+#### Implementation
+Actions are objects that provide the API, and that QML can instantiate directly with it's id. The C++ implementation looks up the action handler via a broker.
+
+* Action: The interface to execute/launch the action. Forwards request and context to broker.
+* ActionHandler: A handler for a specific action. Registers itself with the broker.
+* ActionBroker: Forwards action requests to handlers.
+* Context: The context containing everything the handler needs to execute the action.
+
+### Controller
+For every domain object a controller is implemented to be able to edit the domain object. The domain object is a QObject with a QObject-property for every property of th edomain object and a QValidator, so editors can easily be build using property binding while providing property-level validation and feedback.
+
+The domain object is exposed as an opaque QVariant that can i.e. be used in an action-context. This way details from the infrastructure layer don't leak to the UI layer
 
+### Notifications
+The system will provide notifications from various sources. 
+
+Notifications could be:
+
+* New mails arrived
+* An error occurred
+* A synchronization is in progress
+* ...
+
+Notifications can be displayed in various places of the application.
+
+## Infrastructure
 The infrastructure layer interfaces with the rest of the system. It is the place where we can integrate with various native infrastructure parts.
 The interface of the infrastructure layer, that is used by the domain logic, may not expose any implementation details of any infrastructure part, to ensure that all infrastructure parts are exchangable.
 
-Note: The infrastructure blocks will use only types provided by the domain logic. This means i.e. that no KCalCore containers may be used in such an interface. To avoid hard dependencies on any specific implementation, the infrastructure parts will have to have interfaces, and a factory must be used to supply concrete implementations. That way it is also possible to inject dummy implementations.
-
 ### Akonadi Next
 Akonadi Next is used for primary data access and handles all synchronization.
 
 Interactions with Akonadi Next involve:
+
 * Adding/removing/configuring resources
 * Triggering synchronization
 * Querying of data
@@ -141,71 +163,89 @@ Probably requires access to identities in some way.
 * ObjectTreeParser
 * KMime
 
-## Interaction with external applications
-External applications, like the KDE calendar plasmoid, should be able to load parts of Kube when available. It should for instance be possible to load the Event editor as embeddable QML component, that is fully functional. That way it becomes very easy for third parties to provide extra functionality if Kube is installed, without having to reimplement the Domain Logic (as is the case if only data access is provided through akonadi).
-
-The same mechanism should probably be used by Kube itself to ensure loose coupling and allow mashups with various content types.
-
-Note: We'll probably want a component-viewer application to easily load and test individual components (similar to plasmoidviewer).
-
 ## Testing
 
-* Controllers can be tested by providing mock implementations of the relevant infrastructure parts.
-* Models can be tested by providing fake implementations of the relevant infrastructure parts.
-* Infrastructure parts can be tested individually.
-
-# The new design
-
-The application consists of various application components. A component could be a maillist, an event-editor or the complete kube-mail application. Each component is instantiable on it's own, and has an API to interact with it. The API i.e. allows to set a folder for the maillist, or an event for the event-editor. Components can be nested (a component can instantiate another component)
-
-Components are requested from a factory, allowing to return different versions depending on modifiers passed in, or the global application context (i.e. mobile variants of the UI).
-
-A component primarily is a QML UI.
-The QML UI is built on top of:
-* One or more models that are instantiated to provide the data.
-* Actions that are instatiated in QML.
-
-## Models
+TBD
 
-Models are self contained and have an API to set i.e. a query for what to load. Models can load data from anywhere.
+## Problems/Notes:
+* Dynamic switching between various component UI's can be solved using KPackage
+* change-requests sometimes also need to be handled by sub-components
+** If you hit the reply button in the main view, but replies always work inline in the messagelist, the messagelist should still be able to capture the request and handle it. But if the request only goes to parent objects, that is not possible. Perhaps we need a pub-sub mechanism.
 
+## Example usage in QML
 
-## Actions
-
-An action represents something that can be done, such as "mark as read", "delete", "move somewhere".
-
-An action has:
-* an id (org.kube.mail.make-as-read)
-* an active state (a property for the UI to know when the action can be triggered, that changes depending on the context)
-* an action context, which contains everything the action needs to execute.
-* an action icon
-* an action name
-
-The action context contains the dataset the action works upon plus any additional information that is required. A mark-as-read action for instance only requires the mail-set to work on, while a tag-with action requires any entity (mail, event, ...) and a tag (unless there is one action per tag...).
-The action can through property-binding reevaluate its active state based on the currently set context that the UI continuously updates through property binding. Context objects can be shared by various actions.
-
-### Automatic action discovery
-While in may places explicit instantiation of actions is desirable, sometimes we may want to offer all available actions for a certain type. For this it should be possible to i.e. query for all actions that apply to a mail. That way it is possible to centrally add a new action that automatically becomes available everywhere. Note that this only works for actions that don't require an additional UI, since the components would have to embedd that somewhere.
-
-### Implementation
-
-Actions could be simply objects that provide the API, and that QML can instantiate directly with it's id. The C++ implementation of the action can then lookup the action implementation using the id and call it with it's context when executed.
-
-## Component interaction
-
-The application is made up of various nested components that sometimes need to interact with each other.
-
-If we look at the example of the org.kube.mail component:
-1. The folderlist-component current-folder property is connected to maillist parentFolder property to display the mails of the currently selected folder.
-2. The "add-note" action might either switch the application state to the org.kube.note application, or it might just display a quick-note widget directly inline.
-
-The first usecase can be achieved by the parent component doing a property binding to connect the different components together as desired.
+```
+KubeActions.Action {
+    requestId: "org.kde.kube.mail.reply"
+    onRequest {
+        mail: context.mail
+    }
+}
+
+KubeActions.ActionContext {
+    id: actionContext
+    mail: kubeMailListView.currentMail
+}
+
+KubeActions.ActionHandle {
+    property int progress
+    property bool complete
+    property bool error
+    property string errormessage
+}
+
+KubeActions.Action {
+    id: markAsReadAction
+    action: "org.kde.kube.action.mark-as-read"
+    context: actionContext
+    //execute() returns an ActionHandle
+}
+
+KubeComponents.FolderList {
+    id: kubeFolderListView
+}
+
+KubeComponents.MailList {
+    id: kubeMailListView
+    parentFolder: kubeFolderListView.currentFolder
+}
+
+KubeComponents.MailView {
+    id: kubeMailView
+    mail: kubeMailListView.currentMail
+}
+```
 
-The second usecase requires actions to interact with 'a' parent component, but without knowing with which one. Actions can thus post requests for application state changes, that bubble up through the components and can be catched by any of the parent components.
+## Email Domain Logic
+* Folder list
+    * Folder List Controller
+        * Move mail to folder
+        * Move/Copy/Delete folder
+        * Synchronize folder
+    * Folder List Model
+        * Mixes akonadi next queries and subqueries (folder list with smart folders)
+        * name
+        * statistics
 
-This makes it possible for i.e. a maillist to display a note-widget directly inline, or handing the request up to the parent component which could show a full note editor.
-And if nothing handles the request it bubbles up to the root component (the shell), which can then switch to the note application component.
+* Mail list
+    * MailListController
+        * Mark as read
+        * Flag as important
+        * Move to trash
+    * MailListModel
+        * subject
+        * date
+        * sender
+        * folder
+    * ThreadModel
+        * thread leader (otherwise like maillist model)
+        * number of mails in thread
 
-### Application state changes requests
+* Mail Viewer
+    * MailViewController
+        * reply
+        * forward
+        * move to trash
+    * MailModel
+        * subject, date, sender, folder, content, attachments
 
-A request always requires a context that tells the handler what to do. This could be the note to edit, or the date-range to display in the calendar, or the recepient for the mail composer.
diff --git a/docs/project.md b/docs/project.md
index a710eb1b..9e0db20b 100644
--- a/docs/project.md
+++ b/docs/project.md
@@ -1,14 +1,14 @@
 # Why?
 This project started with the aim to produce a product that doesn't cater to all usecases, but does what it does well.
 We want a codebase that is well maintainable by a small team, and that can move fast.
-We want a codebase where it is fast and easy to prototype new features and turn them eventually into full implementations, without compromising the quality of the rest of the system. Additionaly the product should be portable accross a variety of platforms, including mobile, not only due to a portable codebase, but also due to different interfaces for the various formfactors.
+We want a codebase where it is fast and easy to prototype new features and turn them eventually into full implementations, without compromising the quality of the rest of the system. Additionaly the product should be portable accross a variety of platforms, including mobile, not only due to a portable codebase, but also due to different UI's for the various formfactors.
 
 Because no existing codebase fullfills those premises or easily allows to reach them, this project started.
 
 
 ## Differentiators
 In order to avoid simply replicating what's already existing it's important to know how this product differentiates to other existing solutions.
-This section is supposed to outline that
+This section is supposed to outline that.
 
 * To Roundcube Next
     * Native application
@@ -53,7 +53,7 @@ Team Members: Michael Bohlender, Sandro Knauss, Aaron Seigo
 
 It's the team leads responsibility to:
 
-* Organize regular online meetings (medium yet unknown)
+* Organize regular online meetings (so far on google hangouts)
 * Give direction to the product and ensure it's followed
 * Direct development and oversee decisions
 * Ensure documentation of decisions
@@ -66,10 +66,17 @@ Should the team not be able to reach consensus, the team lead makes the final de
 NOTE: We should probably have a phabricator board for open decisions.
 
 ## Planning
-All planning happens on the KDE Phabricator instance: https://phabricator.kde.org/project/view/43/
+All planning happens on the [KDE Phabricator instance](https://phabricator.kde.org/project/view/43/).
 
 ## Releases / Milestones
 Releases will follow achieved milestones. Milestones are assembled from tasks on the roadmap.
 
 ## Versioning
 The product will follow the semantic versioning scheme (semver.org), with each feature release corresponding to a milestone on phabricator.
+
+## Git repository
+The git repository can be found here: [git://anongit.kde.org/kontact-quick](git://anongit.kde.org/kontact-quick)
+
+The "development" branch is used for the latest development version, master is always stable and always releasable. Branches for specific versions that receive patch releases may be created as required.
+
+For new developments use feature branches prefixed with "feature/" or simply use the "git flow" tool.
diff --git a/docs/usecases.md b/docs/usecases.md
new file mode 100644
index 00000000..4d08d9f7
--- /dev/null
+++ b/docs/usecases.md
@@ -0,0 +1,162 @@
+
+U1 Finding mail
+U 1.1 As a user I want to see my unread mail. #
+U 1.2 As a user  I want to see my important mail
+U 1.3 As a user I want to see the latest mail from a specific folder #
+U 1.4 As a user I want to see the latest mail from a specific account
+U 1.5 As a user I want to see the latest mail from all accounts
+U 1.6 As a user I want to search for a specific  email #
+U1.6.1 by search string matching the full mail #
+U 1.7  As a user I want to get an overview over how many unread mails I have (in my inbox) #
+U 1.8 As a user I want to be notified about incoming mail
+U 1.8.1 As a user I want to be able to set filterrules for incoming mail notifications
+
+U 1.9 As a user I want to go though my mail by thread
+U 1.10 As a user I want to find my emails by date range
+U 1.11 As a user I want to find emails by sender
+
+
+U 1.? As a user I want to regularly see mails that match a custom search query
+
+
+
+U2 Managing mail (B is for bulk)
+U 2.1 As a user I want to delete an email (B) #
+U 2.2 As a user I want to mark an email as read/unread  (B) #
+U 2.3 As a user I want to mark an enail as imporatnt/not important  (B) #
+U 2.4 As a user I want to organize my emails into folders #
+U 2.4.1 As a user I want to create a folder #
+U 2.4.2 As a user I want to remove a folder #
+U 2.4.3 As a user I want to move a folder #
+U 2.4.4 As a user I want to move an email to a folder  (B)  #
+U 2.4.5 As a user I want to copy an email to a folder (B) ??? #
+U 2.4.6 As a user I want to set remote filter rules to automatically sort my incoming emails into folders
+U 2.4.7 As a user I want to set local  filter rules to automatically sort my incoming emails into folders
+U 2.4.8 As a user I want to hide folders
+U 2.4.9 As a user I want to bookmark my favourite folder
+
+
+U 2-? As a user I want to archive an email (B) ???
+U 2-? As a user I want to print an email ???
+U 2-? As a user I want to mark email as spam  (B) ???
+
+U3 Reading mail
+U 3.I As a user I  want to read an email #
+U 3.2 As a user I want to add the sender to my addressbook
+U 3.3 As a user I want to reply to an email #
+U 3.3.1 As a user I want to reply to all #
+U 3.3.2 As a user I want to reply to sender #
+U 3.4 As a user I want to forward an email #
+U 3.5 As a user I want to open an attachemnt #
+U 3.6 As a user I want to save an attachment #
+U 3.7 As a user I want view attachments inline
+U 3.7.1 vcard
+U 3.8 As a user I want to read html mails
+
+
+
+U4 Writing email
+U 4.1 As a user I want to write an email from scratch  #
+U 4.2 As a user I want to write an email from  draft #
+U 4.3 As a user I want to write an email from template
+U 4.5 As a user I want to specify the subject #
+U 4.6 As a user I want to add recievers (to / cc / bcc) #
+U 4.6.1 from addressbook
+U 4.6.2 from previous receivers / senders
+U 4.6.3 by hand #
+U 4.6.4 from ldap #
+U 4.7 As a user I want to handle attachments #
+U 4.7.1  As a user I want to add an attachment #
+U 4.7.1.2  … from the cloud #
+U 4.7.2 As a user I want to remove an attachment #
+U 4.7.3 As a user I want to rename an attachment
+U 4.7.4 As a user I  want to shrink an attachment ???
+U 4.7.5 As a user I want to be warned about not having an attachment
+U 4.8 As a user I want to write html mails
+U 4.9 As a user I want to encrypt my mails
+U 4.9.1 by hand
+U 4.9.2 by policy
+U 4.10 As a user I want to sign my messages
+U 4.10.1 by hand
+U 4.10.2 by policy
+U 4.11 As a user I want to attach a signature to my mails
+U 4.12 As a user I want to have my emails spellchecked
+
+U 4.13 Send email from specific account
+U 4.15 As a user  I want to be able to send my email at a later time specified by me.
+
+
+U 5 Account settup / configuration
+U5.1 As a user I want to set up a Kolab Now account
+U 5.2 As a user I want to set up a custom Kolab account #?
+U 5.3 As a user I want to set up a maildir account #
+U 5.4 As a user I want to set up a imap account (including smtp) #?
+U 5.4.1 As a user I want to specify my Draft / Trash / Sent folder
+U 5.5 As a user I want to delete an account
+U 5.6 As a user I want to modify an account
+U 5.6.1 As a user I want to add/modify/delete and additional identity
+U 5.7 As a user I want to temporarily disable an account
+U 5.8 As a user I want to see the online/offline state of my accounts
+
+U 6 Crypto
+U 6.1 As a user I want to be able to
+
+U 7 Syncronize  with server
+U 7.1 As a user I want to specify which folder get synced
+U 7.2 As a user I want to specfy how many email per folder get synced
+U 7.3 As a user I want to specify the sync intervals
+U 7.4 As a user I want to manually controll the sync
+U 7.5 As a user I want to be able to folder sync priorities
+
+
+U 10 Special features
+U 10.1 As a user I want to set my out of office status
+U 10.2 As a user I want to be only load a partial mail (mobile)
+
+
+
+
+
+
+
+
+
+
+
+
+
+Calendar
+
+U 1 viewing schedule
+
+U 1.1 As a user I want to know what is on the agenda for today
+U 1.2 As a user I want to get an overview over what is coming next week / month
+U 1.3 As a user I want to see when I have free timeslots
+U 1.4 As a user I want to be reminded about upcoming events
+U 1.5 As a user I want to see the schedule of my colleagues
+U 1.6 As a user I want to search for an event
+U 1.7 As a user I want to see the deadlines for my tasks in the calendar
+U 1.8 As a user I want to see the start date for my tasks
+
+U 2  Creating and Importing and Exporting
+U 2.1 As a user I want to create a new event from scratch
+U 2.2 As a user I want to import a calandar (e.g. university schedule)
+U 2.3 As a user I want to import an event
+U 2.4 As a user I want to export an event
+U 2.5 As a user I want to export a calendar
+U 2.6 As a user I want to publish an event
+U 2.6.1 by sending it by email
+
+U 3 Invitations
+U 3.1 As a user I want to invite people to an event
+U 3.2 As a user I want to schedule an event
+U 3.2.1  with my colleagues
+U 3.2.2 with external people (and my colleagues)
+U 3.3 As a user I want to react to invitations
+U 3.3.1 As a user I want to see if I have time for an event I was invited to
+U 3.3.2 As  a user I want to decline an invitation
+U 3.3.3 As a user I want to accept an invitation and add it to my calendar
+U 3.3.4 As a user I want to propose a different timeslot for an event
+U 3.3.5 As a user I want to restart the scheduling process to find a different time slot
+U 3.4 As a user I want to get an overview over pending  invitations I sent
+U 3.5 As a user I want to get an overview over new / incoming invitations
\ No newline at end of file
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 8301392a..0b2b505d 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -24,6 +24,7 @@ find_package(KF5Libkleo)
 
 set(CMAKE_AUTOMOC ON)
 add_definitions("-Wall -std=c++0x -g")
+include_directories(.)
 include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common)
 include_directories(SYSTEM /work/install/include/)
 include_directories(SYSTEM /work/install/include/KF5/)
diff --git a/framework/mail/CMakeLists.txt b/framework/mail/CMakeLists.txt
index 0abc6880..9a32cc83 100644
--- a/framework/mail/CMakeLists.txt
+++ b/framework/mail/CMakeLists.txt
@@ -5,6 +5,7 @@ set(mailplugin_SRCS
     singlemailcontroller.cpp
     folderlistmodel.cpp
     folderlistcontroller.cpp
+    actions/akonadiactions.cpp
     objecttreesource.cpp
     stringhtmlwriter.cpp
 )
@@ -13,7 +14,7 @@ add_library(mailplugin SHARED ${mailplugin_SRCS})
 
 qt5_use_modules(mailplugin Core Quick Qml)
 
-target_link_libraries(mailplugin KF5::akonadi2common KF5::Otp)
+target_link_libraries(mailplugin actionplugin KF5::akonadi2common KF5::Otp actionplugin)
 
 install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
diff --git a/framework/mail/actions/akonadiactions.cpp b/framework/mail/actions/akonadiactions.cpp
new file mode 100644
index 00000000..d0a51deb
--- /dev/null
+++ b/framework/mail/actions/akonadiactions.cpp
@@ -0,0 +1,75 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#include "akonadiactions.h"
+
+#include <actions/context.h>
+
+#include <akonadi2common/clientapi.h>
+
+using namespace Kube;
+
+ActionHandlerHelper::ActionHandlerHelper(const QByteArray &actionId, const std::function<bool(Context*)> &isReady, const std::function<void(Context*)> &handler)
+    : ActionHandler(nullptr),
+    isReadyFunction(isReady),
+    handlerFunction(handler)
+{
+    setActionId(actionId);
+}
+
+bool ActionHandlerHelper::isActionReady(Context *context)
+{
+    return isReadyFunction(context);
+}
+
+void ActionHandlerHelper::execute(Context *context)
+{
+    handlerFunction(context);
+}
+
+static ActionHandlerHelper markAsReadHandler("org.kde.kube.actions.mark-as-read",
+    [](Context *context) -> bool {
+        return context->property("mail").isValid();
+    },
+    [](Context *context) {
+        auto mail = context->property("mail").value<Akonadi2::ApplicationDomain::Mail::Ptr>();
+        if (!mail) {
+            qWarning() << "Failed to get the mail mail: " << context->property("mail");
+            return;
+        }
+        mail->setProperty("unread", false);
+        qDebug() << "Mark as read " << mail->identifier();
+        Akonadi2::Store::modify(*mail).exec();
+    }
+);
+
+static ActionHandlerHelper deleteHandler("org.kde.kube.actions.delete",
+    [](Context *context) -> bool {
+        return context->property("mail").isValid();
+    },
+    [](Context *context) {
+        auto mail = context->property("mail").value<Akonadi2::ApplicationDomain::Mail::Ptr>();
+        if (!mail) {
+            qWarning() << "Failed to get the mail mail: " << context->property("mail");
+            return;
+        }
+        mail->setProperty("unread", false);
+        qDebug() << "Remove " << mail->identifier();
+        Akonadi2::Store::remove(*mail).exec();
+    }
+);
diff --git a/framework/mail/actions/akonadiactions.h b/framework/mail/actions/akonadiactions.h
new file mode 100644
index 00000000..a583ebf8
--- /dev/null
+++ b/framework/mail/actions/akonadiactions.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#pragma once
+
+#include <actions/actionhandler.h>
+#include <functional>
+
+namespace Kube {
+class Context;
+
+class ActionHandlerHelper : public ActionHandler
+{
+    Q_OBJECT
+public:
+    ActionHandlerHelper(const QByteArray &actionId, const std::function<bool(Context*)> &, const std::function<void(Context*)> &);
+
+    bool isActionReady(Context *context) Q_DECL_OVERRIDE;
+    void execute(Context *context) Q_DECL_OVERRIDE;
+private:
+    const std::function<bool(Context*)> isReadyFunction;
+    const std::function<void(Context*)> handlerFunction;
+};
+
+}
diff --git a/framework/mail/folderlistcontroller.cpp b/framework/mail/folderlistcontroller.cpp
index 9edc547c..3b1cf9f8 100644
--- a/framework/mail/folderlistcontroller.cpp
+++ b/framework/mail/folderlistcontroller.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "folderlistcontroller.h"
 
 #include "folderlistmodel.h"
diff --git a/framework/mail/folderlistcontroller.h b/framework/mail/folderlistcontroller.h
index 84ce24be..11057f21 100644
--- a/framework/mail/folderlistcontroller.h
+++ b/framework/mail/folderlistcontroller.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include "folderlistmodel.h"
diff --git a/framework/mail/folderlistmodel.cpp b/framework/mail/folderlistmodel.cpp
index 0f66c46f..204dfdbf 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/mail/folderlistmodel.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "folderlistmodel.h"
 #include <akonadi2common/clientapi.h>
 #include <akonadi2common/applicationdomaintype.h>
diff --git a/framework/mail/folderlistmodel.h b/framework/mail/folderlistmodel.h
index 9ce3ee79..d412c29c 100644
--- a/framework/mail/folderlistmodel.h
+++ b/framework/mail/folderlistmodel.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include <QObject>
diff --git a/framework/mail/maillistcontroller.cpp b/framework/mail/maillistcontroller.cpp
index 07baeb01..ed353b70 100644
--- a/framework/mail/maillistcontroller.cpp
+++ b/framework/mail/maillistcontroller.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "maillistcontroller.h"
 
 #include <QStringList>
diff --git a/framework/mail/maillistcontroller.h b/framework/mail/maillistcontroller.h
index 3c969403..959c63a3 100644
--- a/framework/mail/maillistcontroller.h
+++ b/framework/mail/maillistcontroller.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include "maillistmodel.h"
diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index f7a92097..2314e155 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "maillistmodel.h"
 
 #include "stringhtmlwriter.h"
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h
index 7eb55ffd..1d56e6b8 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/mail/maillistmodel.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include <akonadi2common/clientapi.h>
diff --git a/framework/mail/mailplugin.cpp b/framework/mail/mailplugin.cpp
index bf92f4e7..8b35dfb7 100644
--- a/framework/mail/mailplugin.cpp
+++ b/framework/mail/mailplugin.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "mailplugin.h"
 
 #include "maillistmodel.h"
diff --git a/framework/mail/mailplugin.h b/framework/mail/mailplugin.h
index e835c384..ebd091ee 100644
--- a/framework/mail/mailplugin.h
+++ b/framework/mail/mailplugin.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include <QQmlEngine>
diff --git a/framework/mail/singlemailcontroller.cpp b/framework/mail/singlemailcontroller.cpp
index fecf2fbc..5f7a6d93 100644
--- a/framework/mail/singlemailcontroller.cpp
+++ b/framework/mail/singlemailcontroller.cpp
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #include "singlemailcontroller.h"
 
 SingleMailController::SingleMailController(QObject *parent) : QObject(parent), m_model(new MailListModel)
diff --git a/framework/mail/singlemailcontroller.h b/framework/mail/singlemailcontroller.h
index bdac971c..283b03c4 100644
--- a/framework/mail/singlemailcontroller.h
+++ b/framework/mail/singlemailcontroller.h
@@ -1,3 +1,23 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library 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 Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
 #pragma once
 
 #include "maillistmodel.h"
diff --git a/mkdocs.yml b/mkdocs.yml
index 30b80930..1fa5943d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1 +1,7 @@
-site_name: Kontact Quick
+site_name: Kube
+pages:
+- Index: index.md
+- Project: project.md
+- Design: design.md
+- Requirements: requirements.md
+theme: readthedocs