--- smsdaemon/Sms.cpp	2008/06/09 18:15:53	26
+++ smsdaemon/Sms.cpp	2008/06/10 20:28:42	39
@@ -29,8 +29,7 @@
 		
 		std::string data =  sms.message.substr(pos, sms.message.length()-pos );
 
-		while (data.at(0) == ' ')
-			data = data.substr(1, data.length() -1);
+		data = Util::str_trim(data);
 		return data;
 	}
 }
@@ -65,18 +64,17 @@
 		}
 	}
 
-	while(body.at(0) == ' ') //remove starting space from body
-		body = body.substr( 1, body.length() -1);
+	body = Util::str_trim(body);
 
 	SMS newsms;
 
 	newsms.sms_index = fields[0];
 
 	newsms.sender = fields[2];
-	Util::str_clean(&newsms.sender, "\"");
+	newsms.sender = Util::str_replace(newsms.sender, "\"");
 	
-	newsms.timestamp = fields[4] + std::string(",") + fields[5];
-	Util::str_clean(&newsms.timestamp, "\"");
+	newsms.timestamp = fields[4] + std::string(",") + fields[5];	
+	newsms.timestamp = Util::str_replace(newsms.timestamp, "\"");
 
 	newsms.message = body;