diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 14bad558c..794bb3df7 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -3645,7 +3645,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
     mDisableBreaking = false;
     return;
   }
-  bool listIsEmpty;
+  QStringList listIsEmpty;
   for ( QVector<KMMessage*>::iterator it = mComposedMessages.begin() ; it != mComposedMessages.end() ; ++it ) {
 
     // remove fields that contain no data (e.g. an empty Cc: or Bcc:)
diff --git a/stringutil.cpp b/stringutil.cpp
index ff06416fd..2577c2b08 100644
--- a/stringutil.cpp
+++ b/stringutil.cpp
@@ -856,7 +856,7 @@ bool addressIsInAddressList( const QString& address,
   return false;
 }
 
-QString expandAliases( const QString& recipients, bool &distributionListIsEmpty )
+QString expandAliases( const QString& recipients, QStringList &distributionListEmpty )
 {
   if ( recipients.isEmpty() )
     return QString();
@@ -870,9 +870,11 @@ QString expandAliases( const QString& recipients, bool &distributionListIsEmpty
     QString receiver = (*it).trimmed();
 
     // try to expand distribution list
+    bool distributionListIsEmpty = false;
     QString expandedList = KPIM::KAddrBookExternal::expandDistributionList( receiver, distributionListIsEmpty );
     if ( distributionListIsEmpty ) {
       expandedRecipients += receiver;
+      distributionListEmpty << receiver;
       continue;
     }
 
diff --git a/stringutil.h b/stringutil.h
index 9ab01d5ba..004fecec0 100644
--- a/stringutil.h
+++ b/stringutil.h
@@ -139,7 +139,7 @@ namespace StringUtil
    * Expands aliases (distribution lists and nick names) and appends a
    * domain part to all email addresses which are missing the domain part.
    */
-  QString expandAliases( const QString& recipients,bool &distributionListIsEmpty );
+  QString expandAliases( const QString& recipients,QStringList &distributionListIsEmpty );
 
   /**
    * Uses the hostname as domain part and tries to determine the real name
diff --git a/util.cpp b/util.cpp
index 589dffaa5..bf0a46c69 100644
--- a/util.cpp
+++ b/util.cpp
@@ -135,12 +135,12 @@ bool KMail::Util::validateAddresses( QWidget *parent, const QString &addresses )
 {
   QString brokenAddress;
 
-  bool distributionListIsEmpty;
+  QStringList distributionListEmpty;
   KPIMUtils::EmailParseResult errorCode =
-    KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListIsEmpty ),
+    KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListEmpty ),
                                    brokenAddress );
-  if ( distributionListIsEmpty ) {
-    QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.",addresses );
+  if ( !distributionListEmpty.isEmpty() ) {
+    QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.", distributionListEmpty.join( ", " ) );
     KMessageBox::sorry( parent , errorMsg, i18n("Invalid Email Address") );
     return false;
   }