View | Details | Raw Unified | Return to issue 113134
Collapse All | Expand All

(-)scripting.orig/source/pyprov/mailmerge.py (-2 / +2 lines)
Lines 153-160 Link Here
153
153
154
				if len(textbody):
154
				if len(textbody):
155
					mimeEncoding = re.sub("charset=.*", "charset=UTF-8", flavor.MimeType)
155
					mimeEncoding = re.sub("charset=.*", "charset=UTF-8", flavor.MimeType)
156
			        if mimeEncoding.find('charset=UTF-8') == -1:
156
					if mimeEncoding.find('charset=UTF-8') == -1:
157
			        	mimeEncoding = mimeEncoding + "; charset=UTF-8"
157
						mimeEncoding = mimeEncoding + "; charset=UTF-8"
158
					textmsg['Content-Type'] = mimeEncoding
158
					textmsg['Content-Type'] = mimeEncoding
159
					textmsg['MIME-Version'] = '1.0'
159
					textmsg['MIME-Version'] = '1.0'
160
					textmsg.set_payload(textbody)
160
					textmsg.set_payload(textbody)

Return to issue 113134