mirror of
https://github.com/moparisthebest/davmail
synced 2025-03-04 11:19:43 -05:00
fix ’ in outlook generated body
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@23 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
5bb3bab6c0
commit
f471e40dc3
@ -614,7 +614,7 @@ public class ExchangeSession {
|
|||||||
}
|
}
|
||||||
line = CONTENT_TYPE_HEADER + contentType + ";\n\tboundary=\"" + boundary + "\"";
|
line = CONTENT_TYPE_HEADER + contentType + ";\n\tboundary=\"" + boundary + "\"";
|
||||||
} else {
|
} else {
|
||||||
line = CONTENT_TYPE_HEADER + "text/html";
|
line = CONTENT_TYPE_HEADER + "text/html; charset=UTF-8";
|
||||||
}
|
}
|
||||||
// skip winmail.dat
|
// skip winmail.dat
|
||||||
reader.readLine();
|
reader.readLine();
|
||||||
@ -638,7 +638,7 @@ public class ExchangeSession {
|
|||||||
loadAttachments();
|
loadAttachments();
|
||||||
// TODO : test actual header values
|
// TODO : test actual header values
|
||||||
result.append("\n--").append(boundary)
|
result.append("\n--").append(boundary)
|
||||||
.append("\nContent-Type: text/html")
|
.append("\nContent-Type: text/html; charset=UTF-8")
|
||||||
.append("\nContent-Transfer-Encoding: 7bit")
|
.append("\nContent-Transfer-Encoding: 7bit")
|
||||||
.append("\n\n");
|
.append("\n\n");
|
||||||
|
|
||||||
@ -679,6 +679,8 @@ public class ExchangeSession {
|
|||||||
}
|
}
|
||||||
if (mstnefDetected) {
|
if (mstnefDetected) {
|
||||||
fullHeaders = result.toString();
|
fullHeaders = result.toString();
|
||||||
|
// also fix invalid body characters
|
||||||
|
htmlBody = htmlBody.replaceAll("’","'");
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user