SHINDIG-1426 | Patch from Christiaan Hees | create and modify method signatures in MessageHandler.java