X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/d1b5afe949ebc16b998c2b36236bcf47409db744..74bc871ae581b7331e5254b267be881410ded994:/.mutt/muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5d02477..84f4311 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -2,8 +2,8 @@
 
 set my_confdir="$HOME/.mutt"
 
-set my_attribution_de="Zitiere aus E-Mail von \"%n\" vom %{%Y-%m-%d} um %{%H:%M Uhr %z}:"
-set my_attribution_en="Quoting \"%n\", who wrote on %{%Y-%m-%d} at %{%H:%M Uhr %z}:"
+set my_attribution_de="Hinsichtlich folgendem, das \"%n\" am %{%Y-%m-%d} um %{%H:%M Uhr %Z} schrieb:"
+set my_attribution_en="Regarding the following, written by \"%n\" on %{%Y-%m-%d} at %{%H:%M Uhr %Z}:"
 
 source $my_confdir/confvars
 source $my_confdir/colours
@@ -13,12 +13,11 @@ source $my_confdir/keybindings
 source $my_confdir/lists
 source $my_confdir/spam
 source $my_confdir/hooks
-source $my_confdir/sidebar
 
-auto_view text/html application/ics text/calendar
+auto_view text/html text/calendar
 #auto_view application/x-gunzip application/x-tar-gz application/x-tar application/x-gtar
 #auto_view application/postscript
-alternative_order multipart/mixed multipart/related text/html text/enriched text/*
+alternative_order multipart/mixed multipart/related text/calendar text/html text/enriched text/*
 #alternative_order text/plain text/enriched text/html
 #alternative_order text/enriched text/plain text application/postscript image/*
 mime_lookup application/octet-stream
@@ -26,6 +25,14 @@ mime_lookup application/octet-stream
 mailto_allow cc in-reply-to references subject body
 
 set my_mutt_mailboxes = "$VARDIR/mutt/mailboxes"
-source "test -f $my_mutt_mailboxes && cat $my_mutt_mailboxes|"
+source "test ! -f $my_mutt_mailboxes || cat $my_mutt_mailboxes|"
 
 source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_file|"
+
+# only source sidebar settings if the sidebar patch exist, i.e. default is
+# non-zero
+source "test -z $sidebar_visible || cat $my_confdir/sidebar|"
+
+# only source multipart/alternative settings if the multipart/alternative
+# patch exist, i.e. default is non-zero
+source "test -z $send_multipart_alternative || cat $my_confdir/multipart-alternative|"