diff --git a/src/util-mail.scm b/src/util-mail.scm
index 061bf94..c1d7008 100644
--- a/src/util-mail.scm
+++ b/src/util-mail.scm
@@ -44,7 +44,11 @@
 
  ;; Ensures the subject has proper encoding
  (define (encode-subject subj)
-   subj)
+   (if (string-utf8? subj)
+       (string-append "=?UTF-8?Q?"
+		      (string->qp subj)
+		      "?=")
+       subj))
 
  ;; Sends an email using the UNIX mail(1) utility.
  (define (send-mail body-lines . args)