#349955: previously commited to wrong branch
#349955 by xamount: code cleanup by coder module
#187417: fixed email generated email links.