Added splitting long strings in body before mailing
Merge branch 'development' into dev/j2/common