CHAT-1 Move hard-coded messages to bundle