changed to to from on message page