diff --git a/messageviewer/src/messagepartthemes.qrc b/messageviewer/src/messagepartthemes.qrc
--- a/messageviewer/src/messagepartthemes.qrc
+++ b/messageviewer/src/messagepartthemes.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file alias="asiconpart.html">messagepartthemes/default/templates/asiconpart.html</file>
-        <file alias="attachmentblock.html">messagepartthemes/default/templates/attachmentblock.html</file>
         <file alias="certmessagepart.html">messagepartthemes/default/templates/certmessagepart.html</file>
         <file alias="encapsulatedrfc822messagepart.html">messagepartthemes/default/templates/encapsulatedrfc822messagepart.html</file>
         <file alias="encryptedmessagepart.html">messagepartthemes/default/templates/encryptedmessagepart.html</file>
diff --git a/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp b/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
--- a/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
@@ -22,7 +22,6 @@
 #include "quotehtml.h"
 
 #include "utils/mimetype.h"
-#include "../htmlblock.h"
 #include "../defaultrenderer_p.h"
 #include "../messagepartrenderermanager.h"
 
@@ -83,13 +82,7 @@
     }
     msgPart->setProperty("iconPath", QUrl::fromLocalFile(iconPath).url());
 
-    MimeTreeParser::AttachmentMarkBlock attBlock(nullptr, mp->attachmentContent());
-    if (mp->isAttachment())
-        htmlWriter->write(attBlock.enter());
-
     Grantlee::OutputStream s(htmlWriter->stream());
     t->render(&s, &c);
-    htmlWriter->write(attBlock.exit());
-
     return true;
 }
diff --git a/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp b/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
--- a/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
@@ -22,7 +22,6 @@
 #include "quotehtml.h"
 
 #include "../defaultrenderer_p.h"
-#include "../htmlblock.h"
 #include "../messagepartrenderermanager.h"
 
 #include <MessageCore/StringUtil>
@@ -69,12 +68,7 @@
     }
     c.insert(QStringLiteral("content"), content);
 
-    MimeTreeParser::AttachmentMarkBlock attBlock(nullptr, mp->attachmentContent());
-    if (mp->isAttachment())
-        htmlWriter->write(attBlock.enter());
-
     Grantlee::OutputStream s(htmlWriter->stream());
     t->render(&s, &c);
-    htmlWriter->write(attBlock.exit());
     return true;
 }
diff --git a/messageviewer/src/messagepartthemes/default/templates/asiconpart.html b/messageviewer/src/messagepartthemes/default/templates/asiconpart.html
--- a/messageviewer/src/messagepartthemes/default/templates/asiconpart.html
+++ b/messageviewer/src/messagepartthemes/default/templates/asiconpart.html
@@ -1,3 +1,7 @@
+{% if block.isAttachment %}
+<a name="att{{block.attachmentIndex}}"></a>
+<div id="attachmentDiv{{block.attachmentIndex}}">
+{% endif %}
 <hr/>
 {% if block.inline %}
      <div>
@@ -11,4 +15,7 @@
         <a href="{{block.link}}"><img align="center" height="{{global.iconSize}}" width="{{global.iconSize}}" src="{{block.iconPath}}" border="0" style="max-width: 100%" alt=""/>{{block.label}}</a>
     </div>
 {% endif %}
-<div>{{block.comment}}</div>
\ No newline at end of file
+<div>{{block.comment}}</div>
+{% if block.isAttachment %}
+</div>
+{% endif %}
diff --git a/messageviewer/src/messagepartthemes/default/templates/attachmentblock.html b/messageviewer/src/messagepartthemes/default/templates/attachmentblock.html
deleted file mode 100644
--- a/messageviewer/src/messagepartthemes/default/templates/attachmentblock.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<a name="att{{block.index}}"></a>
-<div id="attachmentDiv{{block.index}}">
-        {{content|safe}}
-</div>
\ No newline at end of file
diff --git a/messageviewer/src/messagepartthemes/default/templates/textmessagepart.html b/messageviewer/src/messagepartthemes/default/templates/textmessagepart.html
--- a/messageviewer/src/messagepartthemes/default/templates/textmessagepart.html
+++ b/messageviewer/src/messagepartthemes/default/templates/textmessagepart.html
@@ -1,3 +1,7 @@
+{% if block.isAttachment %}
+<a name="att{{block.attachmentIndex}}"></a>
+<div id="attachmentDiv{{block.attachmentIndex}}">
+{% endif %}
 {% if block.showTextFrame %}
     <table cellspacing="1" class="textAtm">
         <tr class="textAtmH">
@@ -21,4 +25,7 @@
     </table>
 {% else %}
     {{content|safe}}
-{% endif %}
\ No newline at end of file
+{% endif %}
+{% if block.isAttachment %}
+</div>
+{% endif %}
diff --git a/mimetreeparser/src/viewer/messagepart.h b/mimetreeparser/src/viewer/messagepart.h
--- a/mimetreeparser/src/viewer/messagepart.h
+++ b/mimetreeparser/src/viewer/messagepart.h
@@ -69,10 +69,11 @@
     Q_OBJECT
     Q_PROPERTY(QString plaintextContent READ plaintextContent)
     Q_PROPERTY(QString htmlContent READ htmlContent)
-    Q_PROPERTY(bool attachment READ isAttachment)
+    Q_PROPERTY(bool isAttachment READ isAttachment)
     Q_PROPERTY(bool root READ isRoot)
     Q_PROPERTY(bool isHtml READ isHtml)
     Q_PROPERTY(bool isHidden READ isHidden)
+    Q_PROPERTY(QString attachmentIndex READ attachmentIndex CONSTANT)
 public:
     typedef QSharedPointer<MessagePart> Ptr;
     MessagePart(ObjectTreeParser *otp, const QString &text);
@@ -100,6 +101,8 @@
     KMime::Content *attachmentContent() const;
     void setAttachmentContent(KMime::Content *node);
     bool isAttachment() const;
+    /** @see KMime::Content::index() */
+    QString attachmentIndex() const;
 
     void setIsRoot(bool root);
     bool isRoot() const;
diff --git a/mimetreeparser/src/viewer/messagepart.cpp b/mimetreeparser/src/viewer/messagepart.cpp
--- a/mimetreeparser/src/viewer/messagepart.cpp
+++ b/mimetreeparser/src/viewer/messagepart.cpp
@@ -124,6 +124,11 @@
     return d->mAttachmentNode;
 }
 
+QString MessagePart::attachmentIndex() const
+{
+    return attachmentContent()->index().toString();
+}
+
 void MessagePart::setIsRoot(bool root)
 {
     d->mRoot = root;