diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 1885090998b..a7c1a92c164 100755
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -85,6 +85,12 @@ if ($action == 'send' && ! $_POST['cancel'])
 	include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php');
 	$formsms = new FormSms($db);
 
+	if (! empty($formsms->error))
+	{
+	    $message='<div class="error">'.$formsms->error.'</div>';
+	    $action='test';
+	    $error++;
+	}
     if (empty($body))
     {
         $message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Message")).'</div>';
@@ -151,7 +157,7 @@ print_fiche_titre($langs->trans("SmsSetup"),'','setup');
 print $langs->trans("SmsDesc")."<br>\n";
 print "<br>\n";
 
-if ($message) print $message.'<br>';
+dol_htmloutput_mesg($message);
 
 // List of sending methods
 $listofmethods=(is_array($conf->sms_engine)?$conf->sms_engine:array());
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index adb27154155..6cd8bf9c8c5 100755
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -1,20 +1,20 @@
 <?PHP
 /* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /**
  *       \file       htdocs/core/class/html.formmail.class.php
@@ -32,77 +32,80 @@ require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
  */
 class FormSms
 {
-	var $db;
+    var $db;
 
-	var $fromname;
-	var $fromsms;
-	var $replytoname;
-	var $replytomail;
-	var $toname;
-	var $tomail;
+    var $fromname;
+    var $fromsms;
+    var $replytoname;
+    var $replytomail;
+    var $toname;
+    var $tomail;
 
-	var $withsubstit;			// Show substitution array
-	var $withfrom;
-	var $withto;
-	var $withtopic;
-	var $withbody;
+    var $withsubstit;			// Show substitution array
+    var $withfrom;
+    var $withto;
+    var $withtopic;
+    var $withbody;
 
-	var $withfromreadonly;
-	var $withreplytoreadonly;
-	var $withtoreadonly;
-	var $withtopicreadonly;
-	var $withcancel;
+    var $withfromreadonly;
+    var $withreplytoreadonly;
+    var $withtoreadonly;
+    var $withtopicreadonly;
+    var $withcancel;
 
-	var $substit=array();
-	var $param=array();
+    var $substit=array();
+    var $param=array();
 
-	var $error;
+    var $error;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$DB      Database handler
-	 */
-	function FormSms($DB)
-	{
-		$this->db = $DB;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$DB      Database handler
+     */
+    function FormSms($DB)
+    {
+        $this->db = $DB;
 
-		$this->withfrom=1;
-		$this->withto=1;
-		$this->withtopic=1;
-		$this->withbody=1;
+        $this->withfrom=1;
+        $this->withto=1;
+        $this->withtopic=1;
+        $this->withbody=1;
 
-		$this->withfromreadonly=1;
-		$this->withreplytoreadonly=1;
-		$this->withtoreadonly=0;
-		$this->withtopicreadonly=0;
-		$this->withbodyreadonly=0;
+        $this->withfromreadonly=1;
+        $this->withreplytoreadonly=1;
+        $this->withtoreadonly=0;
+        $this->withtopicreadonly=0;
+        $this->withbodyreadonly=0;
 
-		return 1;
-	}
+        return 1;
+    }
 
-	/**
-	 *	Show the form to input an sms
-	 */
-	function show_form($width='180px')
-	{
-		global $conf, $langs, $user;
+    /**
+     *	Show the form to input an sms
+     *
+     *	@param	string	$width	Width of form
+     *	@return	void
+     */
+    function show_form($width='180px')
+    {
+        global $conf, $langs, $user;
 
-		$langs->load("other");
-		$langs->load("mails");
-		$langs->load("sms");
+        $langs->load("other");
+        $langs->load("mails");
+        $langs->load("sms");
 
-		$form=new Form($this->db);
+        $form=new Form($this->db);
         $soc=new Societe($this->db);
-		if (!empty($this->withtosocid) && $this->withtosocid > 0)
+        if (!empty($this->withtosocid) && $this->withtosocid > 0)
         {
             $soc->fetch($this->withtosocid);
         }
 
-		print "\n<!-- Debut form SMS -->\n";
+        print "\n<!-- Begin form SMS -->\n";
 
-    print '
+        print '
 <script language="javascript">
 function limitChars(textarea, limit, infodiv)
 {
@@ -115,62 +118,62 @@ function limitChars(textarea, limit, infodiv)
 }
 </script>';
 
-		print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		foreach ($this->param as $key=>$value)
-		{
-			print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
-		}
-		print "<table class=\"border\" width=\"100%\">\n";
+        print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        foreach ($this->param as $key=>$value)
+        {
+            print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
+        }
+        print "<table class=\"border\" width=\"100%\">\n";
 
-		// Substitution array
-		if ($this->withsubstit)
-		{
-			print "<tr><td colspan=\"2\">";
-			$help="";
-			foreach($this->substit as $key => $val)
-			{
-				$help.=$key.' -> '.$langs->trans($val).'<br>';
-			}
-			print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
-			print "</td></tr>\n";
-		}
+        // Substitution array
+        if ($this->withsubstit)
+        {
+            print "<tr><td colspan=\"2\">";
+            $help="";
+            foreach($this->substit as $key => $val)
+            {
+                $help.=$key.' -> '.$langs->trans($val).'<br>';
+            }
+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
+            print "</td></tr>\n";
+        }
 
-		// From
-		if ($this->withfrom)
-		{
-			if ($this->withfromreadonly)
-			{
-				print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
-				print "<tr><td width=\"".$width."\">".$langs->trans("SmsFrom")."</td><td>";
-				if ($this->fromtype == 'user')
-				{
-					$langs->load("users");
-					$fuser=new User($this->db);
-					$fuser->fetch($this->fromid);
-					print $fuser->getNomUrl(1);
-					print ' &nbsp; ';
-				}
-				if ($this->fromsms)
-				{
-					print $this->fromsms;
-				}
-				else
-				{
-					if ($this->fromtype)
-					{
-						$langs->load("errors");
-						print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
-					}
-				}
-				print "</td></tr>\n";
-				print "</td></tr>\n";
-			}
-			else
-			{
-				print "<tr><td width=\"".$width."\">".$langs->trans("SmsFrom")."</td><td>";
+        // From
+        if ($this->withfrom)
+        {
+            if ($this->withfromreadonly)
+            {
+                print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
+                print "<tr><td width=\"".$width."\">".$langs->trans("SmsFrom")."</td><td>";
+                if ($this->fromtype == 'user')
+                {
+                    $langs->load("users");
+                    $fuser=new User($this->db);
+                    $fuser->fetch($this->fromid);
+                    print $fuser->getNomUrl(1);
+                    print ' &nbsp; ';
+                }
+                if ($this->fromsms)
+                {
+                    print $this->fromsms;
+                }
+                else
+                {
+                    if ($this->fromtype)
+                    {
+                        $langs->load("errors");
+                        print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
+                    }
+                }
+                print "</td></tr>\n";
+                print "</td></tr>\n";
+            }
+            else
+            {
+                print "<tr><td width=\"".$width."\">".$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-				if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')
+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
                     try
@@ -182,7 +185,7 @@ function limitChars(textarea, limit, infodiv)
                         }
                         else
                         {
-                            $resultsender = $sms->SmsSenderList($conf->global->OVHSMS_ACCOUNT);
+                            $resultsender = $sms->SmsSenderList();
                         }
                     }
                     catch(Exception $e)
@@ -190,12 +193,30 @@ function limitChars(textarea, limit, infodiv)
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                     }
                 }
+                else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                {
+                    $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                    $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                    dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+                    try
+                    {
+                        $classname=ucfirst($classfile);
+                        $sms = new $classname($this->db);
+                        $resultsender = $sms->SmsSenderList();
+                    }
+                    catch(Exception $e)
+                    {
+                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        exit;
+                    }
+                }
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
                     $resultsender[0]->number=$this->fromsms;
                 }
-                if (count($resultsender) > 0)
+
+                if (is_array($resultsender) && count($resultsender) > 0)
                 {
                     print '<select name="fromsms" id="valid" class="flat">';
                     foreach($resultsender as $obj)
@@ -204,69 +225,77 @@ function limitChars(textarea, limit, infodiv)
                     }
                     print '</select>';
                 }
-                else print '<span class="error">'.$langs->trans("SmsNoPossibleRecipientFound").'</span>';
+                else
+                {
+                    print '<span class="error">'.$langs->trans("SmsNoPossibleRecipientFound");
+                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    print '</span>';
+                }
                 print '</td>';
-				print "</tr>\n";
-			}
-		}
+                print "</tr>\n";
+            }
+        }
 
-		// To
-		if ($this->withto || is_array($this->withto))
-		{
-			print '<tr><td width="180">';
-			//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-			$moretext='';
-			print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
-			print '</td><td>';
-			if ($this->withtoreadonly)
-			{
-				print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-			}
-			else
-			{
-			    print "<input size=\"16\" name=\"sendto\" value=\"".(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto):"+")."\">";
-				if (! empty($this->withtosocid) && $this->withtosocid > 0)
-				{
-					$liste=array();
-					foreach ($soc->thirdparty_and_contact_phone_array() as $key=>$value)
-					{
-						$liste[$key]=$value;
-					}
-					print " ".$langs->trans("or")." ";
-					//var_dump($_REQUEST);exit;
-					print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-				}
-				print ' '.$langs->trans("SmsInfoNumero");
-			}
-			print "</td></tr>\n";
-		}
+        // To
+        if ($this->withto || is_array($this->withto))
+        {
+            print '<tr><td width="180">';
+            //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
+            $moretext='';
+            print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
+            print '</td><td>';
+            if ($this->withtoreadonly)
+            {
+                print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+            }
+            else
+            {
+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto):"+")."\">";
+                if (! empty($this->withtosocid) && $this->withtosocid > 0)
+                {
+                    $liste=array();
+                    foreach ($soc->thirdparty_and_contact_phone_array() as $key=>$value)
+                    {
+                        $liste[$key]=$value;
+                    }
+                    print " ".$langs->trans("or")." ";
+                    //var_dump($_REQUEST);exit;
+                    print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+                }
+                print ' '.$langs->trans("SmsInfoNumero");
+            }
+            print "</td></tr>\n";
+        }
 
-		// Message
-		if ($this->withbody)
-		{
-			$defaultmessage='';
-			if ($this->param["models"]=='body') 			{ $defaultmessage=$this->withbody; }
-			$defaultmessage=make_substitutions($defaultmessage,$this->substit,$langs);
-			if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-			$defaultmessage=str_replace('\n',"\n",$defaultmessage);
+        // Message
+        if ($this->withbody)
+        {
+            $defaultmessage='';
+            if ($this->param["models"]=='body')
+            {
+                $defaultmessage=$this->withbody;
+            }
+            $defaultmessage=make_substitutions($defaultmessage,$this->substit,$langs);
+            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
-			print "<tr>";
-			print "<td width=\"180\" valign=\"top\">".$langs->trans("SmsText")."</td>";
-			print "<td>";
-			if ($this->withbodyreadonly)
-			{
-				print nl2br($defaultmessage);
-				print '<input type="hidden" name="message" value="'.$defaultmessage.'">';
-			}
-			else
-			{
+            print "<tr>";
+            print "<td width=\"180\" valign=\"top\">".$langs->trans("SmsText")."</td>";
+            print "<td>";
+            if ($this->withbodyreadonly)
+            {
+                print nl2br($defaultmessage);
+                print '<input type="hidden" name="message" value="'.$defaultmessage.'">';
+            }
+            else
+            {
                 print '<textarea cols="40" name="message" id="message" rows="4" onkeyup="limitChars(this, 160, \'charlimitinfo\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': '.(160-dol_strlen($defaultmessage)).'</div></td>';
-			}
-			print "</td></tr>\n";
-		}
+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';
+            }
+            print "</td></tr>\n";
+        }
 
-		print '
+        print '
            <tr>
             <td>'.$langs->trans("DelayBeforeSending").':</td>
             <td> <input name="deferred" id="deferred" size="4" value="0"></td></tr>
@@ -287,20 +316,21 @@ function limitChars(textarea, limit, infodiv)
            <option value="3">ToolKit</option>
            </select></td></tr>';
 
-		print '<tr><td align="center" colspan="2"><center>';
-		print "<input class=\"button\" type=\"submit\" name=\"sendmail\" value=\"".$langs->trans("SendSms")."\"";
-		print ">";
-		if ($this->withcancel)
-		{
-			print " &nbsp; &nbsp; ";
-			print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
-		}
-		print "</center></td></tr>\n";
-		print "</table>\n";
+        print "</table>\n";
 
-		print "</form>\n";
-		print "<!-- Fin form SMS -->\n";
-	}
+        print '<center>';
+        print "<input class=\"button\" type=\"submit\" name=\"sendmail\" value=\"".$langs->trans("SendSms")."\"";
+        print ">";
+        if ($this->withcancel)
+        {
+            print " &nbsp; &nbsp; ";
+            print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
+        }
+        print "</center>\n";
+
+        print "</form>\n";
+        print "<!-- End form SMS -->\n";
+    }
 
 }