diff --git a/global.org b/global.org
index 5c4d1fe..e591fb2 100644
--- a/global.org
+++ b/global.org
@@ -418,10 +418,13 @@
 	    (beginning-of-line))))
       (global-set-key (kbd "C-a") 'smart-line-beginning)
    #+end_src
-** White-space
-   Trailing whitespace is evil; get rid of it
+** Whitespace
+   Trailing whitespace is evil; get rid of it unless we are in special
+   modes, namely calendar (and later mu4e)
     #+begin_src emacs-lisp
       (setq-default show-trailing-whitespace t)
+      (add-hook 'calendar-mode-hook
+                  #'(lambda () (setq-local show-trailing-whitespace nil)))
       (add-hook 'before-save-hook 'delete-trailing-whitespace)
     #+end_src
    Define what is whitespace during a search
@@ -530,14 +533,16 @@
     #+end_src
 ** Calendar
    #+begin_src emacs-lisp
-     (add-hook 'calendar-load-hook
-       (lambda ()
-       (calendar-set-date-style 'european)))
-     ;; first day of the week is monday instead of sunday:
-     (setq calendar-week-start-day 1
-           calendar-location-name "Toronto, ON Canada"
-           calendar-latitude 43.7
-           calendar-longitude -79.4)
+          (add-hook 'calendar-load-hook
+            (lambda ()
+            (calendar-set-date-style 'european)))
+          ;; first day of the week is monday instead of sunday:
+          (setq calendar-week-start-day 1
+                calendar-location-name "Toronto, ON Canada"
+                calendar-latitude 43.7
+                calendar-longitude -79.4
+                calendar-today-marker "·")
+     (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
    #+end_src
 ** Use local proxy
    I need this to route bibretrieve requests through my local proxy,