Long messages issue resolved