1 files changed, 24 insertions, 11 deletions

diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index dcf0c6e..c75494e 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -24,4 +24,3 @@
 
-WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
-	: QMainWindow( parent, name, fl )
+WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl ):QMainWindow( parent, name, fl )
 {
@@ -261,3 +260,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 	if (replyAll)
-	{
+	{	
 		for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
@@ -270,4 +269,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 	}
-		
-	addRecipients(replyAll);
+	else ccInput->clear();
 	
@@ -275,2 +273,9 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 	
+	QString citation=mail.fromMail;
+	citation.append(tr(" wrote on "));
+	citation.append(mail.date);
+	citation.append(":\n");
+	
+
+	//mail.body.insert(0,tr("On"));
 	pos = 0;
@@ -282,3 +287,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 	}
-	
+	mail.body.insert(0,citation);	
 	emailInput->setText(mail.body);
@@ -310,5 +315,12 @@ bool WriteMail::getRecipients(bool ccField)
 	
-	mail.recipients.clear();
-	
-	ccField ? temp = ccInput->text() : temp=toInput->text() ;
+	if (ccField)
+	{
+		mail.carbonCopies.clear();
+	 	temp = ccInput->text();
+	} 
+	else 
+	{
+		mail.recipients.clear(); 
+		temp=toInput->text() ;
+	}
 	
@@ -320,3 +332,3 @@ bool WriteMail::getRecipients(bool ccField)
 		ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
-		addressList->addContact(str, "");
+		//addressList->addContact(str, "");
 	}
@@ -326,3 +338,3 @@ bool WriteMail::getRecipients(bool ccField)
 	ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
-	addressList->addContact(temp, "");
+	//addressList->addContact(temp, "");
 	
@@ -385,2 +397,3 @@ void WriteMail::newMail()
 	toInput->clear();
+	ccInput->clear();
 	subjectInput->clear();