diff --git a/kmcommands.cpp b/kmcommands.cpp
index ecef47f15..c1f77cca6 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -830,8 +830,8 @@ void KMBounceCommand::execute()
 
 
 KMPrintCommand::KMPrintCommand( QWidget *parent,
-  KMMsgBase *msgBase )
-  : KMCommand( parent, msgBase)
+  KMMsgBase *msgBase, bool htmlOverride )
+  : KMCommand( parent, msgBase), mHtmlOverride( htmlOverride )
 {
 }
 
@@ -840,6 +840,7 @@ void KMPrintCommand::execute()
   KMReaderWin printWin( 0, 0, 0 );
   printWin.setPrinting(TRUE);
   printWin.readConfig();
+  printWin.setHtmlOverride( mHtmlOverride );
   printWin.setMsg(retrievedMessage(), TRUE);
   printWin.printMsg();
 }
diff --git a/kmcommands.h b/kmcommands.h
index c572caeb1..555c959d8 100644
--- a/kmcommands.h
+++ b/kmcommands.h
@@ -349,10 +349,12 @@ class KMPrintCommand : public KMCommand
   Q_OBJECT
 
 public:
-  KMPrintCommand( QWidget *parent, KMMsgBase *msgBase );
+  KMPrintCommand( QWidget *parent, KMMsgBase *msgBase, bool htmlOverride=false );
 
 private:
   virtual void execute();
+
+  bool mHtmlOverride;
 };
 
 class KMSetStatusCommand : public KMCommand
diff --git a/kmreaderwin.h b/kmreaderwin.h
index 256f6b4f1..bb0c80546 100644
--- a/kmreaderwin.h
+++ b/kmreaderwin.h
@@ -155,6 +155,7 @@ public:
   void setAutoDelete(bool f) { mAutoDelete=f; }
 
   /** Override default html mail setting */
+  bool htmlOverride() const { return mHtmlOverride; }
   void setHtmlOverride( bool override );
 
   /** Is html mail to be supported? Takes into account override */