Index: branches/5.3.x/core/units/helpers/mailbox_helper.php
===================================================================
diff -u -N -r16226 -r16519
--- branches/5.3.x/core/units/helpers/mailbox_helper.php	(.../mailbox_helper.php)	(revision 16226)
+++ branches/5.3.x/core/units/helpers/mailbox_helper.php	(.../mailbox_helper.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailbox_helper.php 16226 2015-09-01 08:21:44Z alex $
+* @version	$Id: mailbox_helper.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -46,8 +46,8 @@
 		 */
 		function process($connection_info, $verify_callback, $process_callback, $callback_params = Array (), $include_attachment_contents = true)
 		{
+			/** @var POP3Helper $pop3_helper */
 			$pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info));
-			/* @var $pop3_helper POP3Helper */
 
 			$connection_status = $pop3_helper->initMailbox();
 
@@ -238,8 +238,8 @@
 				return false;
 			}
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			// Get the return address
 			$return_path = '';
@@ -306,8 +306,8 @@
 				$message_body = $esender->ConvertToText($message_body);
 			}
 
+			/** @var MimeDecodeHelper $mime_decode_helper */
 			$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-			/* @var $mime_decode_helper MimeDecodeHelper */
 
 			// convert to site encoding
 			$message_charset = $this->parsedMessage[$message_type][0]['charset'];
@@ -370,8 +370,8 @@
 		{
 			$message = preg_replace("/\r?\n/", "\r\n", trim($message));
 
+			/** @var MimeDecodeHelper $mime_decode_helper */
 			$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-			/* @var $mime_decode_helper MimeDecodeHelper */
 
 			// 1. separate headers from bodies
 			$mime_decode_helper->InitHelper($message);