Port to new MessageHandler signature

Signed-off-by: Jiří Janoušek <janousek.jiri@gmail.com>