2 files changed, 17 insertions, 5 deletions

diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 0dede90..2909893 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -31,11 +31,10 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
-    // TODO: compose mail should get parameters of a recipient for starting
-    // from addressbook. (qcop signal "writeMail(string,string)")
     if (msg == "writeMail(QString,QString)") {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
-        slotComposeMail();
+        // removing the whitespaces at beginning and end is needed!
+        slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
     } else if (msg == "newMail()") {
         slotComposeMail();
@@ -43,8 +42,14 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 }
 
-void OpieMail::slotComposeMail()
+void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
-    qDebug( "Compose Mail" );
     ComposeMail compose( settings, this, 0 , true );
+    if (!email.isEmpty()) {
+        if (!name.isEmpty()) {
+            compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
+        } else {
+            compose.setTo(email);
+        }
+    }
     compose.showMaximized();
     compose.slotAdjustColumns();
@@ -52,4 +57,10 @@ void OpieMail::slotComposeMail()
 }
 
+void OpieMail::slotComposeMail()
+{
+    qDebug( "Compose Mail" );
+    slotwriteMail(0l,0l);
+}
+
 void OpieMail::slotSendQueued()
 {
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 3cf5972..8cbcaa4 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -14,4 +14,5 @@ public:
 
 public slots:
+    void slotwriteMail(const QString&name,const QString&email);
     void slotComposeMail();
     void appMessage(const QCString &msg, const QByteArray &data);