diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index b6ee4e7b..438071bd 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -86,7 +86,14 @@ isEvolution :: Query Bool
 isEvolution = className ~? "gnome.Evolution"
 
 isEvolutionComposer :: Query Bool
-isEvolutionComposer = isEvolution <&&> title =? "Compose Message"
+isEvolutionComposer =
+  isEvolution <&&>
+    (fmap or . sequence)
+      [ title =? "Compose Message"
+      , title ^? "Re: "        -- reply message composer
+      , title ^? "Appointment" -- calendar event editor
+      , title ^? "Meeting"     -- calendar event editor
+      ]
 
 isFirefox :: Query Bool
 isFirefox = className =? "firefox"