diff --git a/common/framework/drivers/sms/coolsms.php b/common/framework/drivers/sms/coolsms.php
index 058cc52a9..a924caba3 100644
--- a/common/framework/drivers/sms/coolsms.php
+++ b/common/framework/drivers/sms/coolsms.php
@@ -53,78 +53,87 @@ class CoolSMS extends Base implements \Rhymix\Framework\Drivers\SMSInterface
 			$sender = new \Nurigo\Api\Message($this->_config['api_key'], $this->_config['api_secret']);
 			
 			// Get recipients.
-			$recipients = $message->getRecipientsWithCountry();
-			foreach ($recipients as $recipient)
+			$recipients = $message->getRecipientsGroupedByCountry();
+			foreach ($recipients as $country => $country_recipients)
 			{
-				// Populate the options object.
-				$options = new \stdClass;
-				$options->from = $message->getFrom();
-				$options->to = $recipient->number;
-				$options->charset = 'UTF-8';
-				$content_full = $message->getContent();
-				
-				// Determine the message type based on the length.
-				$detected_type = $message->checkLength($content_full, $this->_maxlength_sms) ? 'SMS' : 'LMS';
-				$options->type = $detected_type;
-				
-				// If the message has a subject, it must be an LMS.
-				if ($subject = $message->getSubject())
+				if (!$country)
 				{
-					$options->subject = $subject;
-					$options->type = 'LMS';
+					$country_recipients = array(implode(',', $country_recipients));
 				}
 				
-				// If the message has an attachment, it must be an MMS.
-				if ($attachments = $message->getAttachments())
+				foreach ($country_recipients as $recipient_number)
 				{
-					$image = reset($attachments);
-					$options->image = $image->local_filename;
-					$options->type = 'MMS';
-				}
-				
-				// If the recipient is not a Korean number, force SMS.
-				if ($message->isForceSMS() || ($recipient->country && $recipient->country != 82))
-				{
-					unset($options->subject);
-					unset($options->image);
-					$options->country = $recipient->country;
-					$options->type = 'SMS';
-				}
-				
-				// Split the message if necessary.
-				if ($options->type === 'SMS' && $detected_type !== 'SMS')
-				{
-					$content_split = $message->splitMessage($content_full, $this->_maxlength_sms);
-				}
-				elseif ($options->type !== 'SMS' && !$message->checkLength($content_full, $this->_maxlength_lms))
-				{
-					$content_split = $message->splitMessage($content_full, $this->_maxlength_lms);
-				}
-				else
-				{
-					$content_split = array($content_full);
-				}
-				
-				// Send the message.
-				$sent_once = false;
-				foreach ($content_split as $i => $content)
-				{
-					// If splitting a message, don't send the subject and image more than once.
-					if ($sent_once)
+					// Populate the options object.
+					$options = new \stdClass;
+					$options->from = $message->getFrom();
+					$options->to = $recipient_number;
+					$options->charset = 'utf8';
+					$content_full = $message->getContent();
+					
+					// Determine the message type based on the length.
+					$detected_type = $message->checkLength($content_full, $this->_maxlength_sms) ? 'SMS' : 'LMS';
+					$options->type = $detected_type;
+					
+					// If the message has a subject, it must be an LMS.
+					if ($subject = $message->getSubject())
+					{
+						$options->subject = $subject;
+						$options->type = 'LMS';
+					}
+					
+					// If the message has an attachment, it must be an MMS.
+					if ($attachments = $message->getAttachments())
+					{
+						$image = reset($attachments);
+						$options->image = $image->local_filename;
+						$options->type = 'MMS';
+					}
+					
+					// If the recipient is not a Korean number, force SMS.
+					if ($message->isForceSMS() || ($country > 0 && $country != 82))
 					{
 						unset($options->subject);
 						unset($options->image);
+						$options->country = $country;
+						$options->type = 'SMS';
 					}
 					
-					// Set the content and send.
-					$options->text = $content;
-					$result = $sender->send($options);
-					$sent_once = true;
-					
-					if (!$result->success_count)
+					// Split the message if necessary.
+					if ($options->type === 'SMS' && $detected_type !== 'SMS')
 					{
-						$message->errors[] = 'Error while sending message ' . $i . ' of ' . count($content_split) . ' to ' . $options->to;
-						return false;
+						$content_split = $message->splitMessage($content_full, $this->_maxlength_sms);
+					}
+					elseif ($options->type !== 'SMS' && !$message->checkLength($content_full, $this->_maxlength_lms))
+					{
+						$content_split = $message->splitMessage($content_full, $this->_maxlength_lms);
+					}
+					else
+					{
+						$content_split = array($content_full);
+					}
+					
+					// Send the message.
+					$sent_once = false;
+					foreach ($content_split as $i => $content)
+					{
+						// If splitting a message, don't send the subject and image more than once.
+						if ($sent_once)
+						{
+							unset($options->subject);
+							unset($options->image);
+						}
+						
+						// Set the content and send.
+						$options->text = $content;
+						var_dump($options);
+						$result = $sender->send($options);
+						$sent_once = true;
+						
+						if (!$result->success_count)
+						{
+							$message->errors[] = 'Error while sending message ' . $i . ' of ' . count($content_split) . ' to ' . $options->to;
+							return false;
+						}
 					}
 				}
 			}
diff --git a/common/framework/sms.php b/common/framework/sms.php
index 407466f7c..1396946d1 100644
--- a/common/framework/sms.php
+++ b/common/framework/sms.php
@@ -110,6 +110,7 @@ class SMS
 	public function __construct()
 	{
 		$this->driver = self::getDefaultDriver();
+		$this->from = trim(config('sms.default_from'));
 		$this->allow_split_sms = (config('sms.allow_split.sms') !== false);
 		$this->allow_split_lms = (config('sms.allow_split.lms') !== false);
 	}
@@ -129,7 +130,7 @@ class SMS
 	/**
 	 * Get the sender's phone number.
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getFrom()
 	{
@@ -143,11 +144,11 @@ class SMS
 	 * @param string $country Country code (optional)
 	 * @return bool
 	 */
-	public function addTo($number, $country = null)
+	public function addTo($number, $country = 0)
 	{
 		$this->to[] = (object)array(
 			'number' => preg_replace('/[^0-9]/', '', $number),
-			'country' => $country,
+			'country' => intval(preg_replace('/[^0-9]/', '', $country)),
 		);
 		return true;
 	}
@@ -174,6 +175,21 @@ class SMS
 		return $this->to;
 	}
 	
+	/**
+	 * Get the list of recipients grouped by country code.
+	 *
+	 * @return array
+	 */
+	public function getRecipientsGroupedByCountry()
+	{
+		$result = array();
+		foreach ($this->to as $recipient)
+		{
+			$result[$recipient->country][] = $recipient->number;
+		}
+		return $result;
+	}
+	
 	/**
 	 * Set the subject.
 	 *