! swap order of &nbsp; and space to help wrapping
! remove unsupported function from check
! add some additional information to the support block
! In some cases undefined templates could be requested
depending on user notification preferences.  This changes
it such that pbe templates are only called when the message
body is also being requested, otherwise standard templates are used.
Merge pull request #1753 from Spuds/fii

Couple of fixes for final