Small fixes - Now it works with short (text or HTML based) messages.