1 files changed, 24 insertions, 6 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 9b799b3..e6f7daa 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -14,3 +14,2 @@
 //#include <qpe/resource.h>
-#include <qpe/config.h>
 #include <qpe/global.h>
@@ -37,2 +36,3 @@
 
+#include "koprefs.h"
 
@@ -43,3 +43,2 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 {
-  
     mPickLineEdit = 0;
@@ -49,2 +48,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     m_replyid = ""; 
+    if ( KOPrefs::instance()->mUseKapi) {
     KConfig config( locateLocal("config", "kabcrc") );
@@ -58,2 +58,4 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
         
+       
+        fillSettings(); 
     } else
@@ -81,5 +83,7 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 #endif
-    Config cfg( "mail" );
-    cfg.setGroup( "Compose" );
-    checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
+
+    } else {
+        fillSettings();
+    }
+    checkBoxLater->setChecked( KOPrefs::instance()->mSendLater );
 
@@ -89,2 +93,4 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 
+    if ( QApplication::desktop()->width() < 320 )
+        smtpAccountBox->setMaximumWidth( 80 );
     Account *it;
@@ -115,5 +121,17 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) );
-   
+    message->setFont ( KOPrefs::instance()->mComposeFont );
 }
 
+void ComposeMail::fillSettings()
+{
+    if ( QApplication::desktop()->width() < 320 )
+        fromBox->setMaximumWidth( 100 );
+    QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail);
+    QStringList::ConstIterator sit = mailList.begin();
+    int pref = 0;
+    for (;sit!=mailList.end();++sit) {
+        fromBox->insertItem((*sit));
+    }
+    senderNameEdit->setText(KOPrefs::instance()->mName);
+}