diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5f116f9e..f8eb091f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,7 @@ Not yet released
 ----------------
 
 * #642: Added post field as addition to #631.
+* #644: Fixed urlencoding in Nexmo message
 * #639: Added combined notifications.
 * #626: Added redirect check.
 * #627: Latest server output, error and output during a failure will be saved and are shown on the server page.
diff --git a/src/psm/Txtmsg/Nexmo.php b/src/psm/Txtmsg/Nexmo.php
index f7cb7ee7..a4bf51ff 100644
--- a/src/psm/Txtmsg/Nexmo.php
+++ b/src/psm/Txtmsg/Nexmo.php
@@ -53,9 +53,7 @@ class Nexmo extends Core {
 	public function sendSMS($message) {
 		$success = 1;
 		$error = "";
-		
-		$message = rawurlencode($message);
-		
+
 		foreach ($this->recipients as $recipient) {
 			
 			$curl = curl_init();
diff --git a/static/js/scripts.js b/static/js/scripts.js
index 289862ee..5cc12bb8 100755
--- a/static/js/scripts.js
+++ b/static/js/scripts.js
@@ -94,8 +94,31 @@ $().ready(function() {
 	$('#type').change(function () {
 		changeTypeSwitch($('#type').val());
 	});
+
+    // advanced information
+    $(".advanced").hide();
+    var advanced = 0;
+    $("#advanced").click(
+        function() {
+            advancedSwitch((advanced += 1) % 2);
+        });
 });
 
+function advancedSwitch(statusInput) {
+    switch (statusInput) {
+        case 0:
+            $(".advanced").slideUp();
+            break;
+
+        case 1:
+            $(".advanced").slideDown();
+            break;
+
+        default:
+            $(".advanced").hide();
+    }
+}
+
 function changeTypeSwitch(typeInput) {
 	switch (typeInput) {
 		case 'service':