Zaslat SMS: Fixing the spy machine