[evolution] Bug 788050 - Manual check for Junk requires automatic junk filtering on

[Milan Crha <mcrha src gnome org>]

commit d111449fdbc4fbb65b7182c8e07c62793b192134
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 25 14:39:16 2017 +0200

    Bug 788050 - Manual check for Junk requires automatic junk filtering on

 src/mail/e-mail-ui-session.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/mail/e-mail-ui-session.c b/src/mail/e-mail-ui-session.c
index a3b5a7b..2b85f70 100644
--- a/src/mail/e-mail-ui-session.c
+++ b/src/mail/e-mail-ui-session.c
@@ -278,11 +278,10 @@ main_get_filter_driver (CamelSession *session,
        camel_filter_driver_set_play_sound_func (driver, session_play_sound, NULL);
        camel_filter_driver_set_system_beep_func (driver, session_system_beep, NULL);
 
-       add_junk_test =
+       add_junk_test = g_str_equal (type, E_FILTER_SOURCE_JUNKTEST) || (
                priv->check_junk &&
-               (g_str_equal (type, E_FILTER_SOURCE_INCOMING) ||
-               g_str_equal (type, E_FILTER_SOURCE_JUNKTEST)) &&
-               session_folder_can_filter_junk (for_folder);
+               g_str_equal (type, E_FILTER_SOURCE_INCOMING) &&
+               session_folder_can_filter_junk (for_folder));
 
        if (add_junk_test) {
                /* implicit junk check as 1st rule */