-rw-r--r-- | noncore/net/mail/viewmail.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index ec93f8d..84f8a90 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -388,56 +388,58 @@ QString ViewMail::deHtml(const QString &string) | |||
388 | 388 | ||
389 | void ViewMail::slotReply() | 389 | void ViewMail::slotReply() |
390 | { | 390 | { |
391 | if (!m_gotBody) | 391 | if (!m_gotBody) |
392 | { | 392 | { |
393 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok")); | 393 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok")); |
394 | return; | 394 | return; |
395 | } | 395 | } |
396 | 396 | ||
397 | QString rtext; | 397 | QString rtext; |
398 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose | 398 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose |
399 | .arg( m_mail[0] ) | 399 | .arg( m_mail[0] ) |
400 | .arg( m_mail[3] ); | 400 | .arg( m_mail[3] ); |
401 | 401 | ||
402 | QString text = m_mail[2]; | 402 | QString text = m_mail[2]; |
403 | QStringList lines = QStringList::split(QRegExp("\\n"), text); | 403 | QStringList lines = QStringList::split(QRegExp("\\n"), text); |
404 | QStringList::Iterator it; | 404 | QStringList::Iterator it; |
405 | for (it = lines.begin(); it != lines.end(); it++) | 405 | for (it = lines.begin(); it != lines.end(); it++) |
406 | { | 406 | { |
407 | rtext += "> " + *it + "\n"; | 407 | rtext += "> " + *it + "\n"; |
408 | } | 408 | } |
409 | rtext += "\n"; | 409 | rtext += "\n"; |
410 | 410 | ||
411 | QString prefix; | 411 | QString prefix; |
412 | if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = ""; | 412 | if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = ""; |
413 | else prefix = "Re: "; // no i18n on purpose | 413 | else prefix = "Re: "; // no i18n on purpose |
414 | 414 | ||
415 | Settings *settings = new Settings(); | 415 | Settings *settings = new Settings(); |
416 | ComposeMail composer( settings ,this, 0, true); | 416 | ComposeMail composer( settings ,this, 0, true); |
417 | composer.setTo( m_mail[0] ); | 417 | composer.setTo( m_mail[0] ); |
418 | composer.setSubject( "Re: " + m_mail[1] ); | 418 | composer.setSubject( prefix + m_mail[1] ); |
419 | composer.setMessage( rtext ); | 419 | composer.setMessage( rtext ); |
420 | composer.setInReplyTo(m_recMail.Msgid()); | ||
421 | |||
420 | if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) ) | 422 | if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) ) |
421 | { | 423 | { |
422 | m_recMail.Wrapper()->answeredMail(m_recMail); | 424 | m_recMail.Wrapper()->answeredMail(m_recMail); |
423 | } | 425 | } |
424 | } | 426 | } |
425 | 427 | ||
426 | void ViewMail::slotForward() | 428 | void ViewMail::slotForward() |
427 | { | 429 | { |
428 | if (!m_gotBody) | 430 | if (!m_gotBody) |
429 | { | 431 | { |
430 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok")); | 432 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok")); |
431 | return; | 433 | return; |
432 | } | 434 | } |
433 | 435 | ||
434 | QString ftext; | 436 | QString ftext; |
435 | ftext += QString("\n----- Forwarded message from %1 -----\n\n") | 437 | ftext += QString("\n----- Forwarded message from %1 -----\n\n") |
436 | .arg( m_mail[0] ); | 438 | .arg( m_mail[0] ); |
437 | if (!m_mail[3].isNull()) | 439 | if (!m_mail[3].isNull()) |
438 | ftext += QString("Date: %1\n") | 440 | ftext += QString("Date: %1\n") |
439 | .arg( m_mail[3] ); | 441 | .arg( m_mail[3] ); |
440 | if (!m_mail[0].isNull()) | 442 | if (!m_mail[0].isNull()) |
441 | ftext += QString("From: %1\n") | 443 | ftext += QString("From: %1\n") |
442 | .arg( m_mail[0] ); | 444 | .arg( m_mail[0] ); |
443 | if (!m_mail[1].isNull()) | 445 | if (!m_mail[1].isNull()) |