diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml
index eb37263..29dfdd1 100644
--- a/frontend/Cargo.toml
+++ b/frontend/Cargo.toml
@@ -27,7 +27,9 @@ web-sys = { version = "0.3", features = [
   "EventTarget",
   "HtmlElement",
   "HtmlIFrameElement",
+  "HtmlInputElement",
   "HtmlLinkElement",
+  "InputEvent",
   "MediaQueryList",
   "NodeList",
   "Notification",
diff --git a/frontend/src/overview.rs b/frontend/src/overview.rs
index 88d6486..39ddb96 100644
--- a/frontend/src/overview.rs
+++ b/frontend/src/overview.rs
@@ -1,7 +1,8 @@
 use futures::{StreamExt, channel::mpsc::Sender};
 use gloo_console::error;
+use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::spawn_local;
-use web_sys::NotificationOptions;
+use web_sys::{HtmlInputElement, InputEvent, NotificationOptions};
 use yew::prelude::*;
 
 use crate::{
@@ -21,6 +22,7 @@ pub enum Msg {
     Remove(String),
     Loading(bool),
     RemoveAll,
+    Search(String),
 }
 
 #[derive(Clone, PartialEq, Eq)]
@@ -37,6 +39,7 @@ pub struct Overview {
     messages: Vec<MailMessageMetadata>,
     sender: Sender<Action>,
     loading: bool,
+    search_query: String,
 }
 
 impl Component for Overview {
@@ -73,6 +76,7 @@ impl Component for Overview {
             selected: Default::default(),
             sender: wss.sender,
             loading: true,
+            search_query: String::new(),
         }
     }
 
@@ -129,6 +133,9 @@ impl Component for Overview {
                     self.messages.clear();
                 }
             }
+            Msg::Search(query) => {
+                self.search_query = query;
+            }
         };
 
         true
@@ -141,6 +148,7 @@ impl Component for Overview {
 
     fn view(&self, ctx: &Context<Self>) -> Html {
         let link = ctx.link();
+        let filtered_messages = self.filtered_messages();
         let selected_message = self.messages.iter().find(|m| m.id == self.selected);
         let selected_id = self.selected.clone();
 
@@ -149,6 +157,20 @@ impl Component for Overview {
             <header>
               <h1>{"Mail"}<span>{"Crab"}</span></h1>
               <div>
+                <input
+                  type="search"
+                  placeholder="Search mail…"
+                  aria-label="Search mail"
+                  class="search"
+                  oninput={link.callback(|e: InputEvent| {
+                    let query = e
+                        .target()
+                        .and_then(|t| t.dyn_into::<HtmlInputElement>().ok())
+                        .map(|el| el.value())
+                        .unwrap_or_default();
+                    Msg::Search(query)
+                  })}
+                />
                 if !self.messages.is_empty() {
                   <button onclick={link.callback(|_| Msg::RemoveAll)}>
                     {"Remove all"}<span>{"("}{self.messages.len()}{")"}</span>
@@ -174,13 +196,19 @@ impl Component for Overview {
             } else {
               <div class="main">
                 <div class="list">
-                    <ul>
-                        <MessageList
-                            messages={self.messages.clone()}
-                            selected={self.selected.clone()}
-                            select={link.callback(Msg::Select)}
-                        />
-                    </ul>
+                    if filtered_messages.is_empty() {
+                        <div class="no-results" role="status">
+                            {"No messages match your search"}
+                        </div>
+                    } else {
+                        <ul>
+                            <MessageList
+                                messages={filtered_messages}
+                                selected={self.selected.clone()}
+                                select={link.callback(Msg::Select)}
+                            />
+                        </ul>
+                    }
                 </div>
                 <div class="view">
                     if let Some(message) = selected_message {
@@ -198,3 +226,35 @@ impl Component for Overview {
         }
     }
 }
+
+impl Overview {
+    fn filtered_messages(&self) -> Vec<MailMessageMetadata> {
+        let query = self.search_query.trim().to_lowercase();
+        if query.is_empty() {
+            return self.messages.clone();
+        }
+
+        self.messages
+            .iter()
+            .filter(|m| {
+                m.from
+                    .name
+                    .as_deref()
+                    .unwrap_or("")
+                    .to_lowercase()
+                    .contains(&query)
+                    || m.from
+                        .email
+                        .as_deref()
+                        .unwrap_or("")
+                        .to_lowercase()
+                        .contains(&query)
+                    || m.subject.to_lowercase().contains(&query)
+                    || m.envelope_recipients
+                        .iter()
+                        .any(|r| r.to_lowercase().contains(&query))
+            })
+            .cloned()
+            .collect()
+    }
+}
diff --git a/frontend/style.scss b/frontend/style.scss
index c6aeced..931e2c0 100644
--- a/frontend/style.scss
+++ b/frontend/style.scss
@@ -184,6 +184,36 @@ header {
       border-color: var(--red);
     }
   }
+
+  input.search {
+    height: 2.5rem;
+    padding: 0 0.75rem;
+    border: 1px solid var(--border-grey);
+    background: var(--background);
+    color: var(--foreground);
+    font-size: 0.9rem;
+    width: 18rem;
+    min-width: 0;
+    max-width: 100%;
+    margin-right: 0.5rem;
+
+    @media (max-width: 1150px) {
+      width: 12rem;
+    }
+
+    @media (max-width: 1024px) {
+      width: 8rem;
+    }
+
+    &:focus {
+      outline: none;
+      border-color: var(--red);
+    }
+
+    &::placeholder {
+      color: var(--grey);
+    }
+  }
 }
 
 .main {
@@ -243,6 +273,14 @@ header {
     flex-direction: column-reverse;
   }
 
+  .no-results {
+    margin: 3rem 0.75rem;
+    text-align: center;
+    font-size: 1.1rem;
+    font-weight: 200;
+    color: var(--grey);
+  }
+
   li {
     padding: 0.75rem 0.75rem 0.75rem 3.5rem;
     border-bottom: 1px solid var(--border-grey);