better <headers/> construction and addition to message/stanza as xml element