diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp
index b4935d640..a211b872b 100644
--- a/core/textdocumentgenerator.cpp
+++ b/core/textdocumentgenerator.cpp
@@ -390,11 +390,19 @@ QImage TextDocumentGeneratorPrivate::image( PixmapRequest * request )
     QRect rect;
     rect = QRect( 0, request->pageNumber() * size.height(), size.width(), size.height() );
     p.translate( QPoint( 0, request->pageNumber() * size.height() * -1 ) );
+    p.setClipRect( rect );
 #ifdef OKULAR_TEXTDOCUMENT_THREADED_RENDERING
     q->userMutex()->lock();
 #endif
+    QAbstractTextDocumentLayout::PaintContext context;
+    context.palette.setColor( QPalette::Text, Qt::black );
+//  FIXME Fix Qt, this doesn't work, we have horrible hacks
+//        in the generators that return html, remove that code
+//        if Qt ever gets fixed
+//     context.palette.setColor( QPalette::Link, Qt::blue );
+    context.clip = rect;
     mDocument->setDefaultFont( mFont );
-    mDocument->drawContents( &p, rect );
+    mDocument->documentLayout()->draw( &p, context );
 #ifdef OKULAR_TEXTDOCUMENT_THREADED_RENDERING
     q->userMutex()->unlock();
 #endif