diff --git a/messageviewer/src/viewer/messagepart.cpp b/messageviewer/src/viewer/messagepart.cpp
--- a/messageviewer/src/viewer/messagepart.cpp
+++ b/messageviewer/src/viewer/messagepart.cpp
@@ -87,7 +87,9 @@
 void AttachmentMarkBlock::internalEnter()
 {
     if (mWriter && !entered) {
-        mWriter->queue(QStringLiteral("<div id=\"attachmentDiv%1\">\n").arg(mNode->index().toString()));
+        const QString index = mNode->index().toString();
+        mWriter->queue(QStringLiteral("<a name=\"att%1\"></a>").arg(index));
+        mWriter->queue(QStringLiteral("<div id=\"attachmentDiv%1\">\n").arg(index));
         entered = true;
     }
 }
diff --git a/messageviewer/src/viewer/objecttreeparser.cpp b/messageviewer/src/viewer/objecttreeparser.cpp
--- a/messageviewer/src/viewer/objecttreeparser.cpp
+++ b/messageviewer/src/viewer/objecttreeparser.cpp
@@ -337,11 +337,6 @@
 
         ProcessResult processResult(mNodeHelper);
 
-        KMime::ContentIndex contentIndex = node->index();
-        if (htmlWriter() /*&& contentIndex.isValid()*/) {
-            htmlWriter()->queue(QStringLiteral("<a name=\"att%1\"></a>").arg(contentIndex.toString()));
-        }
-
         QByteArray mediaType("text");
         QByteArray subType("plain");
         if (node->contentType(false) && !node->contentType()->mediaType().isEmpty() &&