--- smsdaemon/plugins/EchoPlugin.cpp	2008/06/12 12:43:29	63
+++ smsdaemon/plugins/EchoPlugin.cpp	2008/12/07 15:51:02	142
@@ -1,5 +1,6 @@
 #include "EchoPlugin.h"
-#include "GsmModem.h"
+#include "IGsmModem.h"
+#include "Sms.h"
 
 EchoPlugin::EchoPlugin()
   : Plugin("echo", "Echoes all extra text back to the sender")
@@ -8,5 +9,5 @@
 
 void EchoPlugin::Execute(IGsmModem& modem, SMS& sms)
 {
-	modem.SendSms(sms.sender, GetSmsData(sms), false );
+	modem.SendSms(sms.GetSender(), sms.ExtractParameters(), false );
 }