1 files changed, 7 insertions, 1 deletions
diff --git a/ui/src/components/mail/listing/conversations.rs b/ui/src/components/mail/listing/conversations.rs
index 716f0882..f40c3583 100644
--- a/ui/src/components/mail/listing/conversations.rs
+++ b/ui/src/components/mail/listing/conversations.rs
@@ -417,7 +417,13 @@ impl ListingTrait for ConversationsListing {
                 continue;
             }
             let op = account.operation(env_hash);
-            let body = envelope.body(op);
+            let body = match envelope.body(op) {
+                Ok(b) => b,
+                Err(e) => {
+                    error = Some(e);
+                    break;
+                }
+            };
             let decoded = decode_rec(&body, None);
             let body_text = String::from_utf8_lossy(&decoded);
             if body_text.contains(&filter_term) {