1 files changed, 26 insertions, 7 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index edefda4..59be506 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -718,8 +718,10 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
   if (client == KPimGlobalPrefs::OTHER_EMC)
   {
     channel = KPimGlobalPrefs::instance()->mEmailOtherChannel;
-    message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage;
-    parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters;
+    message = KPimGlobalPrefs::instance()->mEmailOtherMessage;
+    message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage2;
+    parameters = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters;
+    parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters2;
   }
   else
   {
@@ -745,18 +747,29 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
   qDebug("%s ---  %s   %s --- %s %s", channel.latin1(), message.latin1(),message2.latin1(), parameters.latin1(), parameters2.latin1() );
   //KMessageBox::sorry( 0, message2 );
   QProcess * proc = new QProcess( this );
-  QStringList list = QStringList::split( " ", message );
   int i = 0;
   proc->addArgument( channel );
+
+  if ( message.find (" " ) > 0 ) {
+    QStringList list = QStringList::split( " ", message );
+    int i = 0;
   while ( i < list.count ( ) ) {
-      //qDebug("add%sdd ",list[i].stripWhiteSpace().latin1() );
-      proc->addArgument( list[i].stripWhiteSpace() );
+      //qDebug("add%sdd ",list[i].latin1() );
+      proc->addArgument( list[i] );
+      //KMessageBox::sorry( 0,list[i]);
       ++i;
   }
+  } else {
+    proc->addArgument(message );
+    //KMessageBox::sorry( 0, message );
+
+  }
+
   parameters2 = translateMessage(parameters2, urls, "" ); 
   QString arg = "to='%1'";
   arg = arg.arg( emails ) + ","+parameters2;;
  
+  //KMessageBox::sorry( 0,arg );
   //qDebug("2add%sdd ",arg.latin1() );
   proc->addArgument( arg);
   proc->launch("");
@@ -817,16 +830,22 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
   passParameters(&e, parameters, name, emailadress);
 #else // DESKTOP_VERSION
 
-  //KMessageBox::sorry( 0, message );
+  //KMessageBox::sorry( 0,channel );
   QProcess * proc = new QProcess( this );
+  proc->addArgument( channel );
+  if ( message.find (" " ) > 0 ) {
   QStringList list = QStringList::split( " ", message );
   int i = 0;
-  proc->addArgument( channel );
   while ( i < list.count ( ) ) {
       //qDebug("add%sdd ",list[i].latin1() );
       proc->addArgument( list[i] );
+      //KMessageBox::sorry( 0,list[i]);
       ++i;
   }
+  } else {
+    proc->addArgument(message );
+
+  }
   parameters = translateMessage(parameters, name, emailadress);
   proc->addArgument( parameters );
   proc->launch("");