added preloaded messages handling
improved preloaded messages handling
improved preloaded messages handling