--- smsdaemon/Sms.cpp	2008/06/10 20:25:15	38
+++ 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,8 +64,7 @@
 		}
 	}
 
-	while(body.at(0) == ' ') //remove starting space from body
-		body = body.substr( 1, body.length() -1);
+	body = Util::str_trim(body);
 
 	SMS newsms;