diff -r 9da301f47799 -r 2adc2d3542a4 .emacs-my
--- a/.emacs-my	Mon Dec 12 23:04:55 2011 +0200
+++ b/.emacs-my	Thu Dec 15 22:16:25 2011 +0200
@@ -1247,7 +1247,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "smtp, smtpmail")
 
-(when (boundp 'smtpmail-smtp-server)
+(when (and (not (eq system-type 'gnu/linux)) (boundp 'smtpmail-smtp-server))
   (require 'smtpmail)
   (setq
    ;; If you use the default mail user agent.