1 files changed, 12 insertions, 1 deletions

diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 1bc81e4..fb8877a 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -17,2 +17,3 @@
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 
@@ -108,2 +109,6 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags  )
     setup_signalblocking();
+    Config cfg("mail");
+    cfg.setGroup( "Settings" );
+    m_clickopens = cfg.readBoolEntry("clickOpensMail",true);
+
     settings = new Settings();
@@ -236,3 +241,8 @@ void OpieMail::slotEditSettings()
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
-    QPEApplication::execDialog( &settingsDialog );
+    if (QPEApplication::execDialog( &settingsDialog )) {
+        Config cfg("mail");
+        cfg.setGroup( "Settings" );
+        m_clickopens = cfg.readBoolEntry("clickOpensMail",true);
+        emit settingsChanged();
+    }
 }
@@ -344,2 +354,3 @@ void OpieMail::mailLeftClicked(int button, QListViewItem *item,const QPoint&,int
 {
+    if (!m_clickopens) return;
     /* just LEFT button - or tap with stylus on pda */