1 files changed, 17 insertions, 9 deletions

diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index 0336c83..dcf0c6e 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -125,3 +125,3 @@ void WriteMail::init()
         grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
-        QWhatsThis::add(recipientsBox,QWidget::tr("Enter your mail text here"));
+        QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
 
@@ -134,3 +134,3 @@ void WriteMail::init()
         grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
-        QWhatsThis::add(recipientsBox,QWidget::tr("Chose the recipients from this list"));
+        QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
 
@@ -150,3 +150,2 @@ void WriteMail::reject()
 
-// need to insert date
 void WriteMail::accept()
@@ -254,2 +253,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         int pos;
+        QString ccRecipients;
         
@@ -259,3 +259,13 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         toInput->setText(mail.fromMail);
-        //replyAll ? ccInput->setText(mail.c)
+        
+        if (replyAll)
+        {
+                for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
+                {
+                        ccRecipients.append(*it);
+                        ccRecipients.append(";");
+                }
+                        ccRecipients.truncate(ccRecipients.length()-1);         //no ; at the end
+                ccInput->setText(ccRecipients);
+        }
         
@@ -323,4 +333,3 @@ void WriteMail::addRecipients()
 {
-        
-        addRecipients(false);
+        toInput->isVisible() ? addRecipients(false) : addRecipients(true);
         }               
@@ -337,5 +346,5 @@ void WriteMail::addRecipients(bool ccField)
                         if (recipients == "") {
-                                recipients = item->text(0);
+                                recipients = item->text(1);
                         } else {
-                                recipients += "; " + item->text(0);
+                                recipients += "; " + item->text(1);
                         }
@@ -378,3 +387,2 @@ void WriteMail::newMail()
         emailInput->clear();
-        //to clear selected
         setAddressList(addressList);