4 files changed, 78 insertions, 10 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 048fa85..f680f5c 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -4,2 +4,3 @@
 #include <qpe/resource.h>
+#include <qpe/config.h>
 
@@ -13,2 +14,6 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 
+    Config cfg( "mail" );
+    cfg.setGroup( "Compose" );
+    checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
+
     attList->addColumn( tr( "Name" ) );
@@ -32,2 +37,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
                                   tr( "Ok" ) );
+        return;
     }
@@ -155,2 +161,7 @@ void ComposeMail::accept()
 {
+    if ( checkBoxLater->isChecked() ) {
+        qDebug(  "Send later" );
+    }
+
+
     qDebug( "Sending Mail with " +
diff --git a/noncore/net/mail/composemailui.ui b/noncore/net/mail/composemailui.ui
index 9f5feb9..4d225e4 100644
--- a/noncore/net/mail/composemailui.ui
+++ b/noncore/net/mail/composemailui.ui
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>264</width>
+            <width>260</width>
             <height>360</height>
@@ -30,3 +30,3 @@
             <name>margin</name>
-            <number>0</number>
+            <number>3</number>
         </property>
@@ -34,5 +34,16 @@
             <name>spacing</name>
-            <number>0</number>
+            <number>3</number>
         </property>
         <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>checkBoxLater</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>send later</string>
+            </property>
+        </widget>
+        <widget>
             <class>QTabWidget</class>
@@ -61,3 +72,3 @@
                         <name>margin</name>
-                        <number>4</number>
+                        <number>-1</number>
                     </property>
@@ -65,3 +76,3 @@
                         <name>spacing</name>
-                        <number>3</number>
+                        <number>-1</number>
                     </property>
diff --git a/noncore/net/mail/settingsdialog.cpp b/noncore/net/mail/settingsdialog.cpp
index 9741e94..f9de405 100644
--- a/noncore/net/mail/settingsdialog.cpp
+++ b/noncore/net/mail/settingsdialog.cpp
@@ -1,2 +1,2 @@
-#include <qradiobutton.h>
+#include <qcheckbox.h>
 
@@ -21,2 +21,4 @@ void SettingsDialog::readConfig() {
     showHtmlButton->setChecked( cfg.readBoolEntry( "showHtml", false ) );
+    cfg.setGroup( "Compose" );
+    checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
 }
@@ -27,2 +29,4 @@ void SettingsDialog::writeConfig() {
     cfg.writeEntry( "showHtml", showHtmlButton->isChecked() );
+    cfg.setGroup( "Compose" );
+    cfg.writeEntry( "sendLater", checkBoxLater->isChecked() );;
 
diff --git a/noncore/net/mail/settingsdialogui.ui b/noncore/net/mail/settingsdialogui.ui
index 3b03aeb..c5589dc 100644
--- a/noncore/net/mail/settingsdialogui.ui
+++ b/noncore/net/mail/settingsdialogui.ui
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>328</width>
+            <width>324</width>
             <height>379</height>
@@ -68,3 +68,3 @@
                     <widget>
-                        <class>QRadioButton</class>
+                        <class>QCheckBox</class>
                         <property stdset="1">
@@ -75,3 +75,3 @@
                             <name>text</name>
-                            <string>View mail as Html </string>
+                            <string>View mail as Html</string>
                         </property>
@@ -109,4 +109,46 @@
                     <name>title</name>
-                    <string>Tab 2</string>
+                    <string>Compose Mail</string>
                 </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>3</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>3</number>
+                    </property>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>checkBoxLater</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Send mails later ( enqueue in outbox )</string>
+                        </property>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
             </widget>