tentative fix for the breaking of html with some feeds (might break sth)
resolved conflicts, added use of templetating for message creation