[evolution/gnome-40] mail-notification: Show mail folder name as the last in the notification

[Milan Crha <mcrha src gnome org>]

commit 04222ec2e723a3ebee91357c0991f080aa494a50
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jul 12 18:41:13 2021 +0200

    mail-notification: Show mail folder name as the last in the notification
    
    This helps in GNOME Shell, where the notification can be shortened (cut after
    certain characters), thus show more important information, like from whom
    the message is, as the first and the folder name as the last.

 src/plugins/mail-notification/mail-notification.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/mail-notification/mail-notification.c 
b/src/plugins/mail-notification/mail-notification.c
index 6d63ca391b..a73818c55c 100644
--- a/src/plugins/mail-notification/mail-notification.c
+++ b/src/plugins/mail-notification/mail-notification.c
@@ -501,14 +501,6 @@ new_notify_status (EMEventTargetFolder *t)
                "You have received %d new messages.",
                status_count), status_count);
 
-       if (t->full_display_name) {
-               g_string_append_c (text, '\n');
-
-               /* Translators: The '%s' is replaced by the folder name, where a new
-                * mail message arrived. Example: "Folder: On This Computer : Inbox" */
-               g_string_append_printf (text, _("Folder: %s"), t->full_display_name);
-       }
-
        if (t->msg_sender) {
                g_string_append_c (text, '\n');
 
@@ -525,6 +517,14 @@ new_notify_status (EMEventTargetFolder *t)
                g_string_append_printf (text, _("Subject: %s"), t->msg_subject);
        }
 
+       if (t->full_display_name) {
+               g_string_append_c (text, '\n');
+
+               /* Translators: The '%s' is replaced by the folder name, where a new
+                * mail message arrived. Example: "Folder: On This Computer : Inbox" */
+               g_string_append_printf (text, _("Folder: %s"), t->full_display_name);
+       }
+
        if (status_count > 1 && (t->msg_sender || t->msg_subject)) {
                guint additional_messages = status_count - 1;