Feature/messagefiledfix