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
@@ -124,5 +124,5 @@ void WriteMail::init()
         emailInput = new QMultiLineEdit( widget, "emailInput" );
         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"));
 
         addressView = new QListView( widget, "addressView");
@@ -133,5 +133,5 @@ void WriteMail::init()
         addressView->hide();
         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"));
 
         okButton = new QToolButton(bar, "ok");
@@ -149,5 +149,4 @@ void WriteMail::reject()
 }
 
-// need to insert date
 void WriteMail::accept()
 {
@@ -253,4 +252,5 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 {
         int pos;
+        QString ccRecipients;
         
         mail = replyMail;
@@ -258,5 +258,15 @@ 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);
+        }
         
         addRecipients(replyAll);
@@ -322,6 +332,5 @@ bool WriteMail::getRecipients(bool ccField)
 void WriteMail::addRecipients()
 {
-        
-        addRecipients(false);
+        toInput->isVisible() ? addRecipients(false) : addRecipients(true);
         }               
 
@@ -336,7 +345,7 @@ void WriteMail::addRecipients(bool ccField)
                 if ( item->isSelected() ) {
                         if (recipients == "") {
-                                recipients = item->text(0);
+                                recipients = item->text(1);
                         } else {
-                                recipients += "; " + item->text(0);
+                                recipients += "; " + item->text(1);
                         }
                 }
@@ -377,5 +386,4 @@ void WriteMail::newMail()
         subjectInput->clear();
         emailInput->clear();
-        //to clear selected
         setAddressList(addressList);
 }