diff --git a/collects/net/mime-util.ss b/collects/net/mime-util.ss
index 5f465cf19e..02e703a6ff 100644
--- a/collects/net/mime-util.ss
+++ b/collects/net/mime-util.ss
@@ -75,8 +75,7 @@
 	  (cond ((string=? str "") out)
 		(else
 		 (let ((c (string-ref str 0)))
-		   (cond ((or (char=? c #\space)
-			      (char=? c #\tab))
+		   (cond ((memq c '(#\space #\tab #\newline #\return))
 			  (loop out (substring str 1 (string-length str))))
 			 ((char=? c #\");; Begin of quoted string
 			  (let-values ([(quoted rest)
@@ -93,13 +92,13 @@
 
   (define trim-left
     (lambda (str)
-      (let* ((r (regexp "^[ 	]*(.*)"))
+      (let* ((r (regexp "^[ \t\r\n]*(.*)"))
 	     (ans (regexp-match r str)))
-	(and ans (regexp-replace r str "\\1")))))
+	(cadr ans))))
 
   (define trim-right
     (lambda (str)
-      (let* ((r (regexp "[ 	]*$"))
+      (let* ((r (regexp "[ \t\r\n]*$"))
 	     (pos (regexp-match-positions r str)))
 	(substring str 0 (caar pos)))))
 
diff --git a/collects/net/mime.ss b/collects/net/mime.ss
index 3c9bc3a814..8f143c711d 100644
--- a/collects/net/mime.ss
+++ b/collects/net/mime.ss
@@ -33,12 +33,14 @@
            "qp-sig.ss"
            "qp.ss"
            "base64-sig.ss"
-           "base64.ss")
+           "base64.ss"
+	   "head-sig.ss"
+	   "head.ss")
 
   (define-values/invoke-unit/sig net:mime^
     net:mime@
     #f
-    net:base64^ net:qp^)
+    net:base64^ net:qp^ net:head^)
 
   (provide-signature-elements net:mime^))