Message List preparation
Bug fixing