1 files changed, 5 insertions, 1 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 84f8a90..aa8f37a 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -369,97 +369,101 @@ void ViewMail::exec()
     show();
 
     if (!_inLoop)
     {
         _inLoop = true;
         qApp->enter_loop();
     }
 
 }
 
 QString ViewMail::deHtml(const QString &string)
 {
     QString string_ = string;
     string_.replace(QRegExp("&"), "&");
     string_.replace(QRegExp("<"), "&lt;");
     string_.replace(QRegExp(">"), "&gt;");
     string_.replace(QRegExp("\\n"), "<br>");
     return string_;
 }
 
 void ViewMail::slotReply()
 {
     if (!m_gotBody)
     {
         QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
         return;
     }
 
     QString rtext;
             rtext += QString("* %1 wrote on %2:\n")     // no i18n on purpose
              .arg(  m_mail[0] )
              .arg( m_mail[3] );
 
     QString text = m_mail[2];
     QStringList lines = QStringList::split(QRegExp("\\n"), text);
     QStringList::Iterator it;
     for (it = lines.begin(); it != lines.end(); it++)
     {
         rtext += "> " + *it + "\n";
     }
     rtext += "\n";
 
     QString prefix;
     if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
             else prefix = "Re: ";                       // no i18n on purpose
 
     Settings *settings = new Settings();
     ComposeMail composer( settings ,this, 0, true);
-    composer.setTo( m_mail[0] );
+    if (m_recMail.Replyto().isEmpty()) {
+        composer.setTo( m_recMail.getFrom());
+    } else {
+        composer.setTo( m_recMail.Replyto());
+    }
     composer.setSubject( prefix + m_mail[1] );
     composer.setMessage( rtext );
     composer.setInReplyTo(m_recMail.Msgid());
     
     if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
     {
         m_recMail.Wrapper()->answeredMail(m_recMail);
     }
 }
 
 void ViewMail::slotForward()
 {
     if (!m_gotBody)
     {
         QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
         return;
     }
 
     QString ftext;
     ftext += QString("\n----- Forwarded message from %1 -----\n\n")
              .arg( m_mail[0] );
     if (!m_mail[3].isNull())
         ftext += QString("Date: %1\n")
                  .arg( m_mail[3] );
     if (!m_mail[0].isNull())
         ftext += QString("From: %1\n")
                  .arg( m_mail[0] );
     if (!m_mail[1].isNull())
         ftext += QString("Subject: %1\n")
                  .arg( m_mail[1] );
 
     ftext += QString("\n%1\n")
              .arg( m_mail[2]);
 
     ftext += QString("----- End forwarded message -----\n");
 
     Settings *settings = new Settings();
     ComposeMail composer( settings ,this, 0, true);
     composer.setSubject( "Fwd: " + m_mail[1] );
     composer.setMessage( ftext );
     if ( QDialog::Accepted == QPEApplication::execDialog( &composer ))
     {
     }
 }
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )