3 files changed, 10 insertions, 5 deletions
diff --git a/src/backend/rendering/cbookdisplay.cpp b/src/backend/rendering/cbookdisplay.cpp
index f640628..9da57f2 100644
--- a/src/backend/rendering/cbookdisplay.cpp
+++ b/src/backend/rendering/cbookdisplay.cpp
@@ -95,7 +95,7 @@ const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& mod
 
             const QString renderedText = render.renderKeyTree(tree);
             key->setOffset( offset );
-                     qDeleteAll(tree);      // Dispose of the heap allocated objects pointed to in tree.
+            qDeleteAll(tree);      // Dispose of the heap allocated objects pointed to in tree.
             return renderedText;
         };
     };
diff --git a/src/backend/rendering/centrydisplay.cpp b/src/backend/rendering/centrydisplay.cpp
index d3a6aac..b6c7a27 100644
--- a/src/backend/rendering/centrydisplay.cpp
+++ b/src/backend/rendering/centrydisplay.cpp
@@ -58,12 +58,12 @@ const QString CEntryDisplay::text( const QList<CSwordModuleInfo*>& modules, cons
             }
             k1.Verse(0);
             if ( k1.rawText().length() > 0 ) {
-				tree.append( new Rendering::CTextRendering::KeyTreeItem(k1.key(), modules, preverse_settings) );
+                tree.append( new Rendering::CTextRendering::KeyTreeItem(k1.key(), modules, preverse_settings) );
             }
         }
     }
-	tree.append( new Rendering::CTextRendering::KeyTreeItem(keyName, modules, normal_settings) );
+    tree.append( new Rendering::CTextRendering::KeyTreeItem(keyName, modules, normal_settings) );
     QString result(render.renderKeyTree(tree));
     qDeleteAll(tree);
-	return result;
+    return result;
 }
diff --git a/src/backend/rendering/chtmlexportrendering.cpp b/src/backend/rendering/chtmlexportrendering.cpp
index e6d0ff6..6a571c6 100644
--- a/src/backend/rendering/chtmlexportrendering.cpp
+++ b/src/backend/rendering/chtmlexportrendering.cpp
@@ -11,6 +11,8 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <iostream>
+#include <QDebug>
+
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
@@ -132,7 +134,10 @@ const QString CHTMLExportRendering::renderEntry( const KeyTreeItem& i, CSwordKey
         key_renderedText = key->renderedText();
 
         if (m_filterOptions.headings) {
-            (*mod_Itr)->module()->RenderText();
+
+            // only process EntryAttributes, do not render, this might destroy the EntryAttributes again
+            (*mod_Itr)->module()->RenderText(0, -1, 0);
+
             sword::AttributeValue::const_iterator it =
                 (*mod_Itr)->module()->getEntryAttributes()["Heading"]["Preverse"].begin();
             const sword::AttributeValue::const_iterator end =