aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-folder-summary.c
diff options
context:
space:
mode:
Diffstat (limited to 'camel/camel-folder-summary.c')
-rw-r--r--camel/camel-folder-summary.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index bd2ff2d8d5..e89915326e 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1885,9 +1885,8 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam
}
}
-#if 0
- /* this is disabled for now */
- /* also, should this go before/instead of the charset decoding? xml interfaces are utf8 already? */
+ /* we do charset conversions before this filter, which isn't strictly correct,
+ but works in most cases */
if (header_content_type_is(ct, "text", "html")) {
if (p->filter_html == NULL)
p->filter_html = camel_mime_filter_html_new();
@@ -1895,7 +1894,6 @@ summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, Cam
camel_mime_filter_reset((CamelMimeFilter *)p->filter_html);
html_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_html);
}
-#endif
/* and this filter actually does the indexing */
idx_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p->filter_index);