diff --git a/wifiSMS/Classes/MyHTTPConnection.m b/wifiSMS/Classes/MyHTTPConnection.m
index f4a198d..ee378de 100755
--- a/wifiSMS/Classes/MyHTTPConnection.m
+++ b/wifiSMS/Classes/MyHTTPConnection.m
@@ -1046,7 +1046,7 @@ - (NSString *) QueryTotals: (NSString *)CC {
 	[outdata appendString:@"{\"messages\" :[ {\"foo\": \"bar\"}"];
 	
 	if(sqlite3_open([@"/private/var/mobile/Library/SMS/sms.db" UTF8String], &database) == SQLITE_OK) {
-		const char *sqlStatement2 = "SELECT Max(rowid) as rowid, g as group_id, Max(naddress) as address, text, flags FROM (select Max(message .rowid) as rowid, Max(group_id) as g,  CASE WHEN address is Null THEN madrid_handle ELSE address  end as naddress, text, CASE WHEN flags = 3 OR madrid_flags = 12289 THEN 'toMe' ELSE 'fromMe' END as flags from message Group by CASE WHEN address is Null THEN madrid_handle ELSE address  end ) tmp  where group_id <> 0 GROUP BY g ORDER BY rowID DESC";
+		const char *sqlStatement2 = "SELECT Max(rowid) as rowid, g as group_id, Max(naddress) as address, text, flags FROM (select Max(message .rowid) as rowid, Max(group_id) as g,  CASE WHEN address is Null THEN madrid_handle ELSE address  end as naddress, text, CASE WHEN flags = 3 OR madrid_flags = 12289 OR madrid_flags = 4097 THEN 'toMe' ELSE 'fromMe' END as flags from message Group by CASE WHEN address is Null THEN madrid_handle ELSE address  end ) tmp  where group_id <> 0 GROUP BY g ORDER BY rowID DESC";
 
 		sqlite3_stmt *compiledStatement;
 		if(sqlite3_prepare_v2(database, sqlStatement2, -1, &compiledStatement, NULL) == SQLITE_OK) {
diff --git a/wifiSMS/Web/func.js b/wifiSMS/Web/func.js
index ee254a1..d18ddb8 100644
--- a/wifiSMS/Web/func.js
+++ b/wifiSMS/Web/func.js
@@ -112,8 +112,9 @@ $(document).ready(function() {
 		
 	$('#msg').bind('keydown', function(e) {
 		if (e.shiftKey && e.keyCode == 13) {
-				console.log("foo");
-	      	    $(this).val( $(this).val() + "" +  String.fromCharCode(25) + "" ) //well, that didnt work
+                e.preventDefault();
+	      	    $('#msg').val( $('#msg').val() + "" + String.fromCharCode(182) + "" ) //well, that didnt work
+                //e.preventDefault();
       			return false;
 		} else if ( e.keyCode==13 ) {
 		      	SendSMS();
@@ -231,6 +232,14 @@ $(document).ready(function() {
 	    $(this).fadeOut();
 	  }
 	);
+                  
+    $("#msg").hover(
+        function () {
+          $("#QuickEmoji").fadeOut();
+        },
+        function () {
+            //$(this).fadeOut();
+        });
 
 	$("div.btnemoji").click(function() {
 		$("#QuickEmoji").fadeOut();
@@ -846,7 +855,7 @@ function SendSMS() {
 	if (msg == "" || grp == "" || pid == "") {
 		return false;
 	}
-	msg = msg.replace(//g, "\r\n")
+	msg = msg.replace(new RegExp(String.fromCharCode(182), 'g'), "\r\n");
 	$('#msg').val("");
 	
 	
diff --git a/wifiSMS/WifiSMS.xcodeproj/project.xcworkspace/xcuserdata/TreAsoN.xcuserdatad/UserInterfaceState.xcuserstate b/wifiSMS/WifiSMS.xcodeproj/project.xcworkspace/xcuserdata/TreAsoN.xcuserdatad/UserInterfaceState.xcuserstate
index d10172c..4b2bc5a 100644
Binary files a/wifiSMS/WifiSMS.xcodeproj/project.xcworkspace/xcuserdata/TreAsoN.xcuserdatad/UserInterfaceState.xcuserstate and b/wifiSMS/WifiSMS.xcodeproj/project.xcworkspace/xcuserdata/TreAsoN.xcuserdatad/UserInterfaceState.xcuserstate differ