fixing missing company from messages