1 files changed, 18 insertions, 10 deletions

diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index 0336c83..dcf0c6e 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -122,18 +122,18 @@ void WriteMail::init()
 	QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
 
 	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");
 	addressView->addColumn("Name");
 	addressView->addColumn("EMail");
 	addressView->setAllColumnsShowFocus(TRUE);
 	addressView->setMultiSelection(TRUE);
 	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");
 	okButton->setPixmap( Resource::loadPixmap("enter") );
 	okButton->hide();
@@ -147,9 +147,8 @@ void WriteMail::reject()
 {
 	emit cancelMail();
 }
 
-// need to insert date
 void WriteMail::accept()
 {
 	QStringList attachedFiles, attachmentsType;
 	int idCount = 0;
@@ -251,15 +250,26 @@ void WriteMail::attachFile()
 
 void WriteMail::reply(Email replyMail, bool replyAll)
 {
 	int pos;
+	QString ccRecipients;
 	
 	mail = replyMail;
 	mail.files.clear();
 	
 	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);
 	
 	subjectInput->setText(tr("Re: ") + mail.subject);
 	
@@ -320,12 +330,11 @@ bool WriteMail::getRecipients(bool ccField)
 }
 
 void WriteMail::addRecipients()
 {
-	
-	addRecipients(false);
+	toInput->isVisible() ? addRecipients(false) : addRecipients(true);
 }			
-
+       
 void WriteMail::addRecipients(bool ccField)
 {
 	QString recipients = "";
 	
@@ -334,11 +343,11 @@ void WriteMail::addRecipients(bool ccField)
 	QListViewItem *item = addressView->firstChild();
 	while (item != NULL) {
 		if ( item->isSelected() ) {
 			if (recipients == "") {
-				recipients = item->text(0);
+				recipients = item->text(1);
 			} else {
-				recipients += "; " + item->text(0);
+				recipients += "; " + item->text(1);
 			}
 		}
 		item = item->nextSibling();
 	}
@@ -375,7 +384,6 @@ void WriteMail::newMail()
 {
 	toInput->clear();
 	subjectInput->clear();
 	emailInput->clear();
-	//to clear selected
 	setAddressList(addressList);
 }