diff --git a/home-gui.nix b/home-gui.nix
index 9d4125a..c41b663 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -7,6 +7,8 @@
     localsend
   ];
 
+  programs.sioyek.enable = true;
+
   programs.halloy = {
     enable = true;
     settings = {
diff --git a/home-mail.nix b/home-mail.nix
index b03c7e3..d955674 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+
+let
+  # Cross-platform opener command
+  openCmd = if pkgs.stdenv.isDarwin then "open" else "${pkgs.xdg-utils}/bin/xdg-open";
+in
 
 {
   programs.mbsync.enable = true;
@@ -28,9 +33,19 @@
       compose = {
         address-book-cmd = "khard email --parsable '%s'";
       };
+      # viewer = {
+      #   alternatives = "text/html,text/plain";
+      # };
       filters = {
+        "text/plain" = "cat";
         "text/html" = "${pkgs.w3m}/bin/w3m -T text/html -cols $(tput cols) -dump -o display_image=false -o display_link_number=true";
       };
+      openers = {
+        "text/html" = "${openCmd}";
+        "text/plain" = "less -R";
+        "application/pdf" = "${openCmd}";
+        "image/*" = "${openCmd}";
+      };
     };
   };