Feature/messagefiledfix

if possible remove this