3 files changed, 27 insertions, 13 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 35ad367..5f7a76f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -19,4 +19,5 @@
 #include <qcombobox.h>
 #include <qcheckbox.h>
+#include <qiconset.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
@@ -111,18 +112,31 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     mMail = 0;
     warnAttach = true; 
+    QIconSet icon;
+    //icon = SmallIcon("fileexport");
+    icon = SmallIcon("filesave");
+    SaveButton->setIconSet (icon ) ;
+    if ( QApplication::desktop()->width() < 320 ) {
+        SaveButton->setText ("") ;
+        SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
+    }
+    else
+        SaveButton->setText (i18n("Save"));
+#ifndef DESKTOP_VERSION
+    QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
+    QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
+    QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
+#endif
+    message->setFont ( KOPrefs::instance()->mComposeFont );
+    message->setWordWrap (QMultiLineEdit::WidgetWidth);
     if ( smtpAccounts.count() > 0 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( 0, i18n( "Problem" ),
-                                  i18n( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
+                                  i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),
                                   i18n( "Ok" ) );
         return;
-    }
+    } 
     connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) );
-    message->setFont ( KOPrefs::instance()->mComposeFont );
-    message->setWordWrap (QMultiLineEdit::WidgetWidth);
-#ifndef DESKTOP_VERSION
-    QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
-#endif
+
  
 }
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 0a5a750..c66b0c8 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -14,5 +14,5 @@
             <y>0</y>
             <width>276</width>
-            <height>262</height>
+            <height>263</height>
         </rect>
     </property>
@@ -448,5 +448,5 @@
             <property stdset="1">
                 <name>text</name>
-                <string>Save</string>
+                <string> S</string>
             </property>
         </widget>
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 2da103b..89f6ebc 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -13,6 +13,6 @@
             <x>0</x>
             <y>0</y>
-            <width>279</width>
-            <height>304</height>
+            <width>230</width>
+            <height>307</height>
         </rect>
     </property>
@@ -183,5 +183,5 @@
             <property stdset="1">
                 <name>text</name>
-                <string>Prefix will prepend, no need to enter it!</string>
+                <string>Prefix will prepend, do not enter</string>
             </property>
             <property stdset="1">
@@ -247,5 +247,5 @@
             <property stdset="1">
                 <name>text</name>
-                <string>apply only to mails smaller</string>
+                <string>only mails smaller</string>
             </property>
         </widget>