backport display.template.php changes to pm template

Signed-off-by: Illori <illori@simplemachines.org>
Merge pull request #764 from illori/backport_display.template.php_to_PM

backport display.template.php changes to pm template