Version 5.0.6

applications/core/data/emails.xml

@@ -524,7 +524,7 @@
 	</tr>
 </table>
 
-{{$emailContent = $email->parseTextForEmail( $message->post, $email->language, ( \IPS\Settings::i()->email_truncate ? 150 : NULL ) );}}
+{{$emailContent = $email->parseTextForEmail( $message->firstComment()?->post, $email->language, ( \IPS\Settings::i()->email_truncate ? 150 : NULL ) );}}
 {{if $emailContent}}
 <br />
 <table width='100%' cellpadding='0' cellspacing='0' border='0'>
@@ -1918,6 +1918,7 @@ URL: {$content->url()}
 													</p>
 													<br>
 
+													{{if $staff->member_id}}
 													<table width='100%' cellpadding='0' cellspacing='0' border='0'>
 														<tr>
 															<td dir='{dir}' width='40' valign='top'>
@@ -1932,6 +1933,7 @@ URL: {$content->url()}
 															</td>
 														</tr>
 													</table>
+													{{endif}}
 												</td>
 												{{$count++;}}
 												{{if $count == 1 || $count == 3}}
@@ -2049,7 +2051,7 @@ URL: {$content->url()}
 <br>
 <br><strong>{$badge->_title}</strong>
 <br>
-<img src="{file="$badge->image" extension="core_Badges"}">
+<img src='{{if $badge->badge_use_image}}{file="$badge->image" extension="core_Badges"}{{else}}{$badge->_icon}{{endif}}'>
 {{endif}}
 <br /><br />
 <em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$member, $recognize, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("notification__new_recognized")}