1 files changed, 21 insertions, 0 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index d86454c..e11fe1f 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -7,4 +7,6 @@
 #include <qapplication.h>
 
+#include <qpe/config.h>
+
 #include <opie/ofiledialog.h>
 
@@ -110,4 +112,10 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
 }
 
+
+void ViewMail::slotShowHtml( bool state ) {
+    m_showHtml = state;
+    setText();
+}
+
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
     if (!item )
@@ -190,11 +198,20 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
         connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail(  ) ) );
+        connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );
 
         attachments->setEnabled(m_gotBody);
         connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
 
+        readConfig();
 
 }
 
+void ViewMail::readConfig() {
+    Config cfg( "mail" );
+    cfg.setGroup( "Settings" );
+    m_showHtml =  cfg.readBoolEntry( "showHtml", false );
+    showHtml->setOn( m_showHtml );
+}
+
 void ViewMail::setText()
 {
@@ -226,5 +243,9 @@ void ViewMail::setText()
                   "</td></tr></table><font face=fixed>";
 
+    if ( !m_showHtml ) {
         browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
+    } else {
+               browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
+    }
         // remove later in favor of a real handling
         m_gotBody = true;