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
@@ -401,33 +401,37 @@ void ViewMail::slotReply()
 
     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;