Version 4.7.6

system/Email/Email.php

@@ -484,12 +484,19 @@ abstract class _Email
 	 */
 	protected static function _parseElementForClickTracking( $element, $templateKey=NULL )
 	{
+		/* Ignore any links that are mailto links */
+		$href = (string)$element->getAttribute( 'href' );
+		if( \str_starts_with( $href, 'mailto' ) )
+		{
+			return;
+		}
+
 		/* If we are working with mergeAndSend() this may not be a full URL (which may be passed as a user param)
 			so we need to ignore any exceptions and simply not adjust the link, which should be done manually instead */
 		try
 		{
 			$url = \IPS\Http\Url::internal( "app=core&module=system&controller=redirect", 'front' )->setQueryString( array(
-				'url'		=> (string) $element->getAttribute('href'),
+				'url'		=> $href,
 				'resource'	=> ( \IPS\Request::i()->resource ) ? 1 : NULL,
 				'key'		=> hash_hmac( "sha256", (string) $element->getAttribute('href'), \IPS\Settings::i()->site_secret_key . 'r' ),
 				'email'		=> 1,
@@ -760,7 +767,7 @@ abstract class _Email
 				'mlog_subject'				=> $subject,
 				'mlog_content'				=> $html ?: $plaintext,
 				'mlog_resend_data'			=> json_encode( array( 'type' => $this->type, 'headers' => $this->_compileHeaders( $subject, $to, $cc, $bcc, $fromEmail, $fromName, $additionalHeaders, $boundary ), 'body' => array( 'html' => $html, 'plain' => $plaintext ), 'boundary' => $boundary ) ),
-				'mlog_msg'					=> json_encode( array( 'message' => $e->getMessage(), 'details' => $e->extraDetails ) ),
+				'mlog_msg'					=> json_encode( array( 'message' => $e->messageKey, 'details' => $e->extraDetails ) ),
 				'mlog_smtp_log'				=> $this->getLog(),
 				'mlog_notification_sent' 	=> FALSE
 			) );