diff --git a/src/util-mail.scm b/src/util-mail.scm
index f72edb2..0b7ae4b 100644
--- a/src/util-mail.scm
+++ b/src/util-mail.scm
@@ -40,6 +40,14 @@
  ;; All emails go to this override
  (define *mailto-override* (make-parameter "dominik.pantucek@trustica.cz"))
 
+ ;; Encodes given UTF-8 string as quoted-printable
+ (define (string->qp str)
+   str)
+
+ ;; Ensures the subject has proper encoding
+ (define (encode-subject subj)
+   subj)
+
  ;; Sends an email using the UNIX mail(1) utility.
  (define (send-mail body-lines . args)
    (let ((from (get-keyword #:from args))
@@ -60,7 +68,7 @@
 	      (append (if from
 			  (list "-r" from)
 			  '())
-		      (list "-s" subject)
+		      (list "-s" (encode-subject subject))
 		      real-tos)
 	      body-lines))))