From a977351f0abce1bb463ff8f0a44d28f3befc73ee Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Mon, 13 Sep 2021 13:21:09 +0300
Subject: [PATCH] mail/view: respect per-folder/account pager filter override

---
 src/components/mail/view.rs | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/components/mail/view.rs b/src/components/mail/view.rs
index 72f11cca..a7931f7c 100644
--- a/src/components/mail/view.rs
+++ b/src/components/mail/view.rs
@@ -1345,12 +1345,26 @@ impl Component for MailView {
                             let colors = crate::conf::value(context, "mail.view.body");
                             self.pager =
                                 Pager::from_string(text, Some(context), Some(0), None, colors);
+                            if let Some(ref filter) = mailbox_settings!(
+                                context[self.coordinates.0][&self.coordinates.1]
+                                    .pager
+                                    .filter
+                            ) {
+                                self.pager.filter(filter);
+                            }
                             self.subview = None;
                         }
                     } else {
                         text.push_str("Internal error. MailView::open_attachment failed.");
                         let colors = crate::conf::value(context, "mail.view.body");
                         self.pager = Pager::from_string(text, Some(context), Some(0), None, colors);
+                        if let Some(ref filter) = mailbox_settings!(
+                            context[self.coordinates.0][&self.coordinates.1]
+                                .pager
+                                .filter
+                        ) {
+                            self.pager.filter(filter);
+                        }
                         self.subview = None;
                     }
                 }
@@ -1431,6 +1445,13 @@ impl Component for MailView {
                     };
                     let colors = crate::conf::value(context, "mail.view.body");
                     self.pager = Pager::from_string(text, Some(context), None, None, colors);
+                    if let Some(ref filter) = mailbox_settings!(
+                        context[self.coordinates.0][&self.coordinates.1]
+                            .pager
+                            .filter
+                    ) {
+                        self.pager.filter(filter);
+                    }
                 }
                 /*
                 ViewMode::Ansi(ref buf) => {
@@ -1482,6 +1503,13 @@ impl Component for MailView {
                     let colors = crate::conf::value(context, "mail.view.body");
                     self.pager =
                         Pager::from_string(text, Some(context), Some(cursor_pos), None, colors);
+                    if let Some(ref filter) = mailbox_settings!(
+                        context[self.coordinates.0][&self.coordinates.1]
+                            .pager
+                            .filter
+                    ) {
+                        self.pager.filter(filter);
+                    }
                     self.subview = None;
                 }
                 _ => {
@@ -1498,6 +1526,13 @@ impl Component for MailView {
                     let colors = crate::conf::value(context, "mail.view.body");
                     self.pager =
                         Pager::from_string(text, Some(context), Some(cursor_pos), None, colors);
+                    if let Some(ref filter) = mailbox_settings!(
+                        context[self.coordinates.0][&self.coordinates.1]
+                            .pager
+                            .filter
+                    ) {
+                        self.pager.filter(filter);
+                    }
                     self.subview = None;
                 }
             };