Message functionality extended