1 files changed, 17 insertions, 9 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
@@ -120,22 +120,22 @@ void WriteMail::init()
 	grid->addWidget( addressButton, 0, 2 );
 	connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
 	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();
 	connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
 	QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
@@ -145,13 +145,12 @@ void WriteMail::init()
 
 void WriteMail::reject()
 {
 	emit cancelMail();
 }
 
-// need to insert date
 void WriteMail::accept()
 {
 	QStringList attachedFiles, attachmentsType;
 	int idCount = 0;
 	
 	if (toInput->text() == "") 
@@ -249,18 +248,29 @@ void WriteMail::attachFile()
 	addAtt->showMaximized();
 }
 
 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);
 	
 	pos = 0;
@@ -318,29 +328,28 @@ bool WriteMail::getRecipients(bool ccField)
 	
 	return TRUE;
 }
 
 void WriteMail::addRecipients()
 {
-	
-	addRecipients(false);
+	toInput->isVisible() ? addRecipients(false) : addRecipients(true);
 }			
 
 void WriteMail::addRecipients(bool ccField)
 {
 	QString recipients = "";
 	
 	mail.recipients.clear();
 	
 	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();
 	}
 	
 	ccField ? ccInput->setText(recipients):toInput->setText(recipients);
@@ -373,9 +382,8 @@ void WriteMail::setRecipient(const QString &recipient)
 
 void WriteMail::newMail()
 {
 	toInput->clear();
 	subjectInput->clear();
 	emailInput->clear();
-	//to clear selected
 	setAddressList(addressList);
 }