[evolution] Merge mail-recognized-thread-related-headers into mail-sorting-message-list

[Andre Klapper <aklapper src gnome org>]

commit 5142da73dc3ba096a347f4695078a46158f91565
Author: Andre Klapper <a9016009 gmx de>
Date:   Mon Sep 11 14:35:05 2017 +0200

    Merge mail-recognized-thread-related-headers into mail-sorting-message-list

 help/C/mail-recognized-thread-related-headers.page |   31 --------------------
 help/C/mail-sorting-message-list.page              |    1 +
 help/CMakeLists.txt                                |    1 -
 3 files changed, 1 insertions(+), 32 deletions(-)
---
diff --git a/help/C/mail-sorting-message-list.page b/help/C/mail-sorting-message-list.page
index 926b1e9..a227fe9 100644
--- a/help/C/mail-sorting-message-list.page
+++ b/help/C/mail-sorting-message-list.page
@@ -33,6 +33,7 @@
 <title>Sorting Mail in Email Threads</title>
 <p>You can use a threaded message view to sort emails. To enable this feature, click on 
<guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or press 
<keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
 <p>This feature, when enabled, groups replies with the original email and allows you to follow the flow of 
the conversation from one message to the next.</p>
+<note style="tip"><p><app>Evolution</app> recognizes <code its:translate="no" its:locNote="Translators: Do 
NOT translate 'References'">References</code> and <code its:translate="no" its:locNote="Translators: Do NOT 
translate 'In-Reply-To'">In-Reply-To</code> mail headers.</p></note>
 <p>When a new message arrives, it will be added below the parent message. Threads are sorted and displayed 
based on the date of the most recent message received.</p>
 <note style="tip"><p>For Advanced Users: There is a GSettings key that allows you to toggle between the 
collapsed and expanded state of the email threads. The collapsed state is enabled by default. It can be 
changed by starting the <app>Terminal</app> application and running the command <cmd>gsettings set 
org.gnome.evolution.mail thread-expand true</cmd></p>
 <list>
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index a4ca9d8..cf2e0b1 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -185,7 +185,6 @@ set(HELP_FILES
        mail-receiving-options-unix-mbox-spool-directory.page
        mail-receiving-options-unix-mbox-spool-file.page
        mail-receiving-options-usenet-news.page
-       mail-recognized-thread-related-headers.page
        mail-refresh-folders.page
        mail-save-as-pdf.page
        mail-search-folders-add.page