Index: openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	28 Nov 2007 13:07:20 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	28 Nov 2007 19:58:29 -0000	1.13
@@ -147,3 +147,54 @@
     mime::finalize $mime -subordinates all
     return $body
 }
+
+ad_proc build_subject {
+    subject
+    {charset "UTF-8"}
+} {
+    Encode the subject of an email message and trim long lines.
+
+    This proc is based on mime::word_encode which we don't use
+    directly since it doesn't split correctly long lines and 
+    doesn't wrap the resulting lines correctly either in the version
+    provided by tcllib 1.8
+} {
+
+    set encoding [ns_encodingforcharset $charset]
+    set subject [encoding convertto $encoding "$subject "]
+
+    # encode subject with quoted-printable
+    set qp_subject [mime::qp_encode $subject 1 1]
+
+    # maxlen for each line
+    # 69 = 76 - 7 where 7 is for "=?"+"?Q?+"?="
+    set maxlen [expr {69 - [string length $charset]}]
+
+    # Based on mime::qp_encode to trim long lines
+    set result ""
+    if { [string length $qp_subject] > $maxlen } {
+
+        while { [string length $qp_subject] > $maxlen } {
+            set chunk [string range $qp_subject 0 $maxlen]
+            if {[regexp -- {(_[^_]*)$} $chunk dummy end]} {
+                
+                # Don't break in the middle of a word
+                set len [expr {$maxlen - [string length $end]}]
+                set chunk [string range $qp_subject 0 $len]
+                incr len
+                set qp_subject [string range $qp_subject $len end]
+            } else {
+                set qp_subject [string range $qp_subject [expr {$maxlen + 1}] end]
+            }
+            append result "=?$charset?Q?$chunk?=\n "
+        }
+        # Trim off last "\n ", since the above code has the side-effect
+        # of adding an extra "\n " to the encoded string.
+        set result [string range $result 0 end-2]
+
+    } else {
+        set result "=?$charset?Q?$qp_subject?="
+    }
+
+    return $result
+}