3 files changed, 41 insertions, 3 deletions

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index 52cb2f6c..a9fab402 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -54,9 +54,15 @@ Item {
             }
 
             ComboBox {
-                model: ["Kuberich <kuberich@kolabnow.com>", "Uni <kuberich@university.edu>", "Spam <hello.spam@spam.to>"]
+                model: composer.identityModel
 
                 Layout.fillWidth: true
+
+                currentIndex: composer.fromIndex
+
+                onCurrentIndexChanged: {
+                    composer.fromIndex = currentIndex
+                }
             }
 
             Label {
diff --git a/framework/mail/composer.cpp b/framework/mail/composer.cpp
index aa1ec7fc..6f603979 100644
--- a/framework/mail/composer.cpp
+++ b/framework/mail/composer.cpp
@@ -22,7 +22,7 @@
 
 Composer::Composer(QObject *parent) : QObject(parent)
 {
-
+    m_identityModel << "Kuberich <kuberich@kolabnow.com>" << "Uni <kuberich@university.edu>" << "Spam <hello.spam@spam.to>";
 }
 
 QString Composer::to() const
@@ -90,6 +90,24 @@ void Composer::setBody(const QString &body)
     }
 }
 
+QStringList Composer::identityModel() const
+{
+    return m_identityModel;
+}
+
+int Composer::fromIndex() const
+{
+    return m_fromIndex;
+}
+
+void Composer::setFromIndex(int fromIndex)
+{
+    if(m_fromIndex != fromIndex) {
+        m_fromIndex = fromIndex;
+        emit fromIndexChanged();
+    }
+}
+
 void Composer::send()
 {
     //TODO
@@ -106,4 +124,8 @@ void Composer::clear()
 {
     setSubject("");
     setBody("");
+    setTo("");
+    setCc("");
+    setBcc("");
+    setFromIndex(-1);
 }
\ No newline at end of file
diff --git a/framework/mail/composer.h b/framework/mail/composer.h
index a9741f6b..bdb59840 100644
--- a/framework/mail/composer.h
+++ b/framework/mail/composer.h
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <QString>
-
+#include <QStringList>
 
 class Composer : public QObject
 {
@@ -31,6 +31,8 @@ class Composer : public QObject
     Q_PROPERTY (QString bcc READ bcc WRITE setBcc NOTIFY bccChanged)
     Q_PROPERTY (QString subject READ subject WRITE setSubject NOTIFY subjectChanged)
     Q_PROPERTY (QString body READ body WRITE setBody NOTIFY bodyChanged)
+    Q_PROPERTY (QStringList identityModel READ identityModel)
+    Q_PROPERTY (int fromIndex READ fromIndex WRITE setFromIndex NOTIFY fromIndexChanged)
 
 public:
     explicit Composer(QObject *parent = Q_NULLPTR);
@@ -50,12 +52,18 @@ public:
     QString body() const;
     void setBody(const QString &body);
 
+    QStringList identityModel() const;
+
+    int fromIndex() const;
+    void setFromIndex(int fromIndex);
+
 signals:
     void subjectChanged();
     void bodyChanged();
     void toChanged();
     void ccChanged();
     void bccChanged();
+    void fromIndexChanged();
 
 public slots:
     void send();
@@ -68,4 +76,6 @@ private:
     QString m_bcc;
     QString m_subject;
     QString m_body;
+    QStringList m_identityModel;
+    int m_fromIndex;
 };