1 files changed, 33 insertions, 3 deletions

diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp
index 7cd3e09..dc98a6f 100644
--- a/noncore/net/mailit/readmail.cpp
+++ b/noncore/net/mailit/readmail.cpp
@@ -61,3 +61,7 @@ void ReadMail::init()
         connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
-
+        
+        forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ),
+        QString::null, 0, this, 0 );
+        connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) );
+        
         previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
@@ -109,2 +113,4 @@ void ReadMail::updateView()
         replyButton->removeFrom(bar);
+        forwardButton->removeFrom(mailMenu);
+        forwardButton->removeFrom(bar);
         
@@ -113,3 +119,6 @@ void ReadMail::updateView()
                 replyButton->addTo(mailMenu);
-                
+                forwardButton->addTo(bar);
+                forwardButton->addTo(mailMenu);
+
+                                
                 if (!mail->downloaded) {
@@ -147,2 +156,9 @@ void ReadMail::updateView()
                 }
+
+                text +="<br><b>CC: </b>";
+                for (QStringList::Iterator it = mail->carbonCopies.begin();
+                        it != mail->carbonCopies.end(); ++it ) {
+                        text += *it + " ";
+                }
+                
                 text += "<br>"  + mail->date;
@@ -204,2 +220,10 @@ void ReadMail::updateView()
                 }
+                
+                text += "\nCC: ";
+                for (QStringList::Iterator it = mail->carbonCopies.begin();
+                        it != mail->carbonCopies.end(); ++it ) {
+                        text += *it + " ";
+                }
+
+                                
                 text += "\nDate: " + mail->date + "\n";
@@ -325,3 +349,9 @@ void ReadMail::reply()
 {
-        emit replyRequested(*mail);
+        emit replyRequested(*mail, (bool&)TRUE);
 }
+
+void ReadMail::forward()
+{
+        emit forwardRequested(*mail);
+}
+