Merge remote-tracking branch 'origin/release/20.04'

src/search/searchpatternedit.cpp

@@ -82,9 +82,6 @@ static const int SpecialRuleFieldsCount
 
 SearchRuleWidget::SearchRuleWidget(QWidget *parent, SearchRule::Ptr aRule, SearchPatternEdit::SearchPatternEditOptions options, SearchPatternEdit::SearchModeType modeType)
     : QWidget(parent)
-    , mRuleField(nullptr)
-    , mFunctionStack(nullptr)
-    , mValueStack(nullptr)
 {
     initFieldList(options);
     initWidget(modeType);

src/search/searchrule/searchrulestatus.h

@@ -27,8 +27,8 @@ namespace MailCommon {
 //TODO: Check if the below one is needed or not!
 // The below are used in several places and here so they are accessible.
 struct MessageStatusInfo {
-    const char *text;
     const char *context;
+    const char *text;
     const char *icon;
 };