Message conversion, continued...

And yet more modifications to make for display alone :/

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>