diff --git a/espanso/src/patch/mod.rs b/espanso/src/patch/mod.rs
index 3582aae..e499181 100644
--- a/espanso/src/patch/mod.rs
+++ b/espanso/src/patch/mod.rs
@@ -50,6 +50,7 @@ fn get_builtin_patches() -> Vec<PatchDefinition> {
     patches::linux::simple_terminal_2_x11::patch(),
     patches::linux::terminator_terminal_x11::patch(),
     patches::linux::termite_terminal_x11::patch(),
+    patches::linux::thunderbird_x11::patch(),
     patches::linux::tilix_terminal_x11::patch(),
     patches::linux::urxvt_terminal_x11::patch(),
     patches::linux::xterm_terminal_x11::patch(),
diff --git a/espanso/src/patch/patches/linux/mod.rs b/espanso/src/patch/patches/linux/mod.rs
index 6dd311b..d145f16 100644
--- a/espanso/src/patch/patches/linux/mod.rs
+++ b/espanso/src/patch/patches/linux/mod.rs
@@ -27,6 +27,7 @@ pub mod simple_terminal_2_x11;
 pub mod simple_terminal_x11;
 pub mod terminator_terminal_x11;
 pub mod termite_terminal_x11;
+pub mod thunderbird_x11;
 pub mod tilix_terminal_x11;
 pub mod urxvt_terminal_x11;
 pub mod xterm_terminal_x11;
diff --git a/espanso/src/patch/patches/linux/thunderbird_x11.rs b/espanso/src/patch/patches/linux/thunderbird_x11.rs
new file mode 100644
index 0000000..df0df04
--- /dev/null
+++ b/espanso/src/patch/patches/linux/thunderbird_x11.rs
@@ -0,0 +1,41 @@
+/*
+ * This file is part of espanso.
+ *
+ * Copyright (C) 2019-2021 Federico Terzi
+ *
+ * espanso is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * espanso is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with espanso.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+use std::sync::Arc;
+
+use crate::patch::patches::{PatchedConfig, Patches};
+use crate::patch::PatchDefinition;
+
+pub fn patch() -> PatchDefinition {
+  PatchDefinition {
+    name: module_path!().split(':').last().unwrap_or("unknown"),
+    is_enabled: || cfg!(target_os = "linux") && !super::util::is_wayland(),
+    should_patch: |app| app.class.unwrap_or_default().contains("Thunderbird"),
+    apply: |base, name| {
+      Arc::new(PatchedConfig::patch(
+        base,
+        name,
+        Patches {
+          paste_shortcut: Some(Some("CTRL+SHIFT+V".to_string())),
+          ..Default::default()
+        },
+      ))
+    },
+  }
+}