From 28ec8e642bb17e3b7e03d70dd8af751d3089ccd8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 18 Mar 2022 09:08:27 +0100
Subject: [PATCH] disable subject when replying

---
 src/librssguard/services/gmail/gmailnetworkfactory.cpp  | 5 -----
 src/librssguard/services/gmail/gmailserviceroot.cpp     | 2 +-
 src/librssguard/services/gmail/gui/formaddeditemail.cpp | 7 ++++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp
index 8f0a01bc4..cfacbcb18 100644
--- a/src/librssguard/services/gmail/gmailnetworkfactory.cpp
+++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp
@@ -63,16 +63,11 @@ QString GmailNetworkFactory::sendEmail(Mimesis::Message msg, const QNetworkProxy
 
   if (reply_to_message != nullptr) {
     // We need to obtain some extra information.
-
     auto metadata = getMessageMetadata(reply_to_message->m_customId, {
       QSL("References"),
       QSL("Message-ID")
     }, custom_proxy);
 
-    /*if (metadata.contains(QSL("References"))) {
-
-       }*/
-
     if (metadata.contains(QSL("Message-ID"))) {
       msg["References"] = metadata.value(QSL("Message-ID")).toStdString();
       msg["In-Reply-To"] = metadata.value(QSL("Message-ID")).toStdString();
diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp
index 0aa104d68..663815a3e 100644
--- a/src/librssguard/services/gmail/gmailserviceroot.cpp
+++ b/src/librssguard/services/gmail/gmailserviceroot.cpp
@@ -114,7 +114,7 @@ QList<QAction*> GmailServiceRoot::contextMenuMessagesList(const QList<Message>&
     m_replyToMessage = messages.at(0);
 
     if (m_actionReply == nullptr) {
-      m_actionReply = new QAction(qApp->icons()->fromTheme(QSL("mail-reply-sender")), tr("Reply to this message"), this);
+      m_actionReply = new QAction(qApp->icons()->fromTheme(QSL("mail-reply-sender")), tr("Reply to this e-mail message"), this);
       connect(m_actionReply, &QAction::triggered, this, &GmailServiceRoot::replyToEmail);
     }
 
diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.cpp b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
index 944673d16..0af21ff43 100644
--- a/src/librssguard/services/gmail/gui/formaddeditemail.cpp
+++ b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
@@ -56,6 +56,7 @@ void FormAddEditEmail::execForReply(Message* original_message) {
 
   addRecipientRow(m_originalMessage->m_author);
   m_ui.m_txtSubject->setText(QSL("Re: %1").arg(m_originalMessage->m_title));
+  m_ui.m_txtSubject->setEnabled(false);
   m_ui.m_txtMessage->setFocus();
   exec();
 }
@@ -130,9 +131,9 @@ void FormAddEditEmail::onOkClicked() {
   }
   catch (const ApplicationException& ex) {
     MsgBox::show(this, QMessageBox::Icon::Critical,
-                     tr("E-mail NOT sent"), tr("Your e-mail message wasn't sent."),
-                     QString(),
-                     ex.message());
+                 tr("E-mail NOT sent"), tr("Your e-mail message wasn't sent."),
+                 QString(),
+                 ex.message());
   }
 }