diff --git a/messageviewer/src/htmlwriter/teehtmlwriter.cpp b/messageviewer/src/htmlwriter/teehtmlwriter.cpp
index d18d46f5aa030fa4d7945eba57da7f8423d9b90d..b32afbc84b8698545a29d24f9243d20aacd19499 100644
--- a/messageviewer/src/htmlwriter/teehtmlwriter.cpp
+++ b/messageviewer/src/htmlwriter/teehtmlwriter.cpp
@@ -61,49 +61,56 @@ void TeeHtmlWriter::addHtmlWriter(HtmlWriter *writer)
 
 void TeeHtmlWriter::begin(const QString &css)
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->begin(css);
     }
 }
 
 void TeeHtmlWriter::end()
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->end();
     }
 }
 
 void TeeHtmlWriter::reset()
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->reset();
     }
 }
 
 void TeeHtmlWriter::write(const QString &str)
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->write(str);
     }
 }
 
 void TeeHtmlWriter::queue(const QString &str)
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->queue(str);
     }
 }
 
 void TeeHtmlWriter::flush()
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->flush();
     }
 }
 
 void TeeHtmlWriter::embedPart(const QByteArray &contentId, const QString &url)
 {
-    for (QList<HtmlWriter *>::Iterator it = mWriters.begin(); it != mWriters.end(); ++it) {
+    QList<HtmlWriter *>::const_iterator end(mWriters.constEnd());
+    for (QList<HtmlWriter *>::const_iterator it = mWriters.constBegin(); it != end; ++it) {
         (*it)->embedPart(contentId, url);
     }
 }