took out messagecount again
took out messagecount again
resolved conflict