[#6883] ticket:497 add template with footer for message and fixed test
[#6863] ticket:497 Minor template fix