From ec33cc7b1f2d305da673668f948f0e8d75b31dea Mon Sep 17 00:00:00 2001
From: Boris Shmarin <b.shmarin@omp.ru>
Date: Mon, 8 Nov 2021 16:19:29 +0300
Subject: [PATCH] [nemo-qml-plugin-email] Add OriginalSubject sorting order.
 Contributes to JB#6059

---
 src/emailmessagelistmodel.cpp | 9 ++++++---
 src/emailmessagelistmodel.h   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/emailmessagelistmodel.cpp b/src/emailmessagelistmodel.cpp
index 54750bb..9baa147 100644
--- a/src/emailmessagelistmodel.cpp
+++ b/src/emailmessagelistmodel.cpp
@@ -64,7 +64,7 @@ EmailMessageListModel::EmailMessageListModel(QObject *parent)
     roles[MessageSizeSectionRole] = "sizeSection";
     roles[MessageFolderIdRole] = "folderId";
     roles[MessageParsedSubject] = "parsedSubject";
-    roles[MessageTrimmedSubject] = "trimmedSubject";
+    roles[MessageOriginalSubject] = "originalSubject";
     roles[MessageHasCalendarCancellationRole] = "hasCalendarCancellation";
 
     m_key = key();
@@ -237,9 +237,9 @@ QVariant EmailMessageListModel::data(const QModelIndex & index, int role) const
         subject.replace(QRegExp("<\\s*img", Qt::CaseInsensitive), "<no-img");
         subject.replace(QRegExp("<\\s*a", Qt::CaseInsensitive), "<no-a");
         return subject;
-    } else if (role == MessageTrimmedSubject) {
+    } else if (role == MessageOriginalSubject) {
         QString subject = QMailMessageListModel::data(index, QMailMessageModelBase::MessageSubjectTextRole).toString();
-        return subject.replace(QRegExp(QStringLiteral("^(re:|fw:|fwd:|\\s*)*"), Qt::CaseInsensitive), QString());
+        return subject.replace(QRegExp(QStringLiteral("^(re:|fw:|fwd:|\\s*|\\\")*"), Qt::CaseInsensitive), QString());
     } else if (role == MessageHasCalendarCancellationRole) {
         return (messageMetaData.status() & QMailMessageMetaData::CalendarCancellation) != 0;
     }
@@ -446,6 +446,9 @@ void EmailMessageListModel::sortByOrder(Qt::SortOrder sortOrder, EmailMessageLis
     case Subject:
         m_sortKey = QMailMessageSortKey::subject(sortOrder);
         break;
+    case OriginalSubject:
+        m_sortKey = QMailMessageSortKey::originalSubject(sortOrder);
+        break;
     case Time:
         m_sortKey = QMailMessageSortKey::timeStamp(sortOrder);
         break;
diff --git a/src/emailmessagelistmodel.h b/src/emailmessagelistmodel.h
index 3c0eb03..1fb89cd 100644
--- a/src/emailmessagelistmodel.h
+++ b/src/emailmessagelistmodel.h
@@ -71,13 +71,13 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
         MessageSizeSectionRole,                                // returns size section (0-2)
         MessageFolderIdRole,                                   // returns parent folder id for the message
         MessageParsedSubject,                                  // returns the message subject parsed against a pre-defined regular expression
-        MessageTrimmedSubject,                                 // returns the message subject without Re: and Fwd: prefixes
+        MessageOriginalSubject,                                 // returns the message subject without Re: and Fwd: prefixes
         MessageHasCalendarCancellationRole,                    // returns 1 if message has a calendar cancellation, 0 otherwise
     };
 
     enum Priority { LowPriority, NormalPriority, HighPriority };
 
-    enum Sort { Time, Sender, Size, ReadStatus, Priority, Attachments, Subject, Recipients };
+    enum Sort { Time, Sender, Size, ReadStatus, Priority, Attachments, Subject, Recipients, OriginalSubject };
 
     enum SearchOn { LocalAndRemote, Local, Remote };