diff --git a/home-manager/roles/mail.nix b/home-manager/roles/mail.nix
index 11816e1b..1d5069e2 100644
--- a/home-manager/roles/mail.nix
+++ b/home-manager/roles/mail.nix
@@ -237,6 +237,7 @@ in {
         set pgp_use_gpg_agent = yes
         set pgp_default_key="${gpg}"
         set timeout = 5
+        set ts_enabled = yes
 
         set abort_noattach = ask-no
         set abort_noattach_regex = "(hängt an|anhäng|anhang|anbei|angehängt|attach|attached|attachments?)"
diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc
index f9800195..71e25023 100644
--- a/home-manager/roles/zsh/zshrc
+++ b/home-manager/roles/zsh/zshrc
@@ -17,13 +17,10 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|screen*|tmux*)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;
-    screen*|tmux*)
-      printf '\033]2;%s\033\\' "`print -Pn "${1:q}"`"
-      ;;
     *)
       if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
         print -Pn "\e]2;${2:q}\a" # set window name