new function CreateMessageBodyPart, Content-Transfer-Encoding back to MimeWrapMessage and small fix

1 files changed, 21 insertions, 7 deletions

diff --git a/firma b/firma
index ad76486..0d70a62 100755
--- a/firma
+++ b/firma
@@ -1799,6 +1799,7 @@ function EmailListAdministration {
     # send a message back to the administrator
     RECIPIENTS="$SENDER_ADDRESS"
     SUBJECT="admin request results"
+    CreateMessageBodyPart
     MimeWrapMessage
     echo "$MESSAGE" | $MAIL_AGENT $MAIL_AGENT_ARGS $SENDER_ADDRESS
   else
@@ -1874,13 +1875,6 @@ Content-Type: multipart/encrypted;
   boundary=\"${boundary}\"
 Content-Disposition: inline"
 
-  # this is the body of the message to be sent, so no indentation here
-  MESSAGE_BODY="\
-Content-Type: text/plain; charset=iso-8859-1
-Content-Disposition: inline
-
-$MESSAGE_BODY"
-
   GPG_MESSAGE="`echo -e "${PASSPHRASE}\n${MESSAGE_BODY}" | $GPG_ENCRYPT --recipient $RECIPIENTS`"
 
   # this is the body of the message to be sent, so no indentation here
@@ -1907,6 +1901,26 @@ ${MESSAGE_HEADERS}
 ${MESSAGE_BODY}"
 }
 
+
+function CreateMessageBodyPart {
+  #-------------------------------------------------------------
+  # create a message body part
+  #
+  # parameter(s): none
+  # depends on variable(s): MESSAGE_BODY
+  #
+  # returns: 0
+  #-------------------------------------------------------------
+
+  # this is the body of the message to be sent, so no indentation here
+  MESSAGE_BODY="\
+Content-Type: text/plain; charset=iso-8859-1
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+$MESSAGE_BODY"
+}
+
 #-------------------------------------------------------------
 # main()
 #-------------------------------------------------------------