Added logic for dealing with echo messages of max size