Messages functionality extended