diff --git a/index.js b/index.js
index b560ea8..8d63272 100644
--- a/index.js
+++ b/index.js
@@ -75,7 +75,8 @@ function onHttpIncomingMessage(request, response) {
     var qs = url.parse(request.url, true).query;
     logger.info("onHttpIncomingMessage()", {qs: qs});
     
-    ym.sendPM(qs.to, qs.msg);
+    var destination = qs.to.replace(config.globals.msisdn_suffix, '');
+    ym.sendPM(destination, qs.msg);
     response.end('OK');
 }
 
@@ -85,11 +86,12 @@ function formatTimestamp(ts) {
 }
 
 function forwardMessageToEvo(sender, message, ts) {
+    var msisdn = sender + config.globals.msisdn_suffix;
     var opts = {
         url: config.globals.evo_url,
         qs: {
             msg: message,
-            msisdn: sender,
+            msisdn: msisdn,
             smsc: config.globals.smsc,
             ts: ts
         }