Modification 1

Find the following code around line

			$comment_arr[4] = preg_replace("/\b((http(s?):\/\/)|(www\.))([\w\.]+)([-~\/\w+\.-?]+)\b/i", "<a href=\"http$3://$4$5$6\" target=\"_blank\">$2$4$5$6</a>", $comment_arr[4]);
			$comment_arr[4] = preg_replace("/([\w\.]+)(@)([-\w\.]+)/i", "<a href=\"mailto:$0\">$0</a>", $comment_arr[4]);


					$output = str_replace("{mail}", "$comment_arr[2]",$output);
					$output = str_replace("{date}", date($config_timestamp_comment, $comment_arr[0]),$output);

And replace it with the following code

			$comment_arr[4] = preg_replace("/\b((http(s?):\/\/)|(www\.))([\w\.]+)([-~\/\w+\.-?]+)\b/i", "<a href=\"http$3://$4$5$6\" target=\"_blank\">$2$4$5$6</a>", $comment_arr[4]);
			$comment_arr[4] = preg_replace("/([\w\.]+)(@)([-\w\.]+)/i", "<a href=\"mailto:$0\">$0</a>", $comment_arr[4]);


// Avatars in comments
foreach ($all_users as $rawUser) {
	$userInfo = explode('|', $rawUser);
	if ($name_to_nick[$userInfo[2]] == $comment_arr[1]) {
	    $commAvatar = $userInfo[8];
		break;
	}
}
if (trim($commAvatar) == '') {
    $commAvatar = 'DEFAUTL_AVATAR_URL';
}

$output = str_replace('{avatar-url}', $commAvatar,$output);
// End Avatars in comments

					$output = str_replace("{mail}", "$comment_arr[2]",$output);
					$output = str_replace("{date}", date($config_timestamp_comment, $comment_arr[0]),$output);