Index: branches/5.2.x/core/units/forms/submission_log/submission_log_tp.php
===================================================================
diff -u -N -r15152 -r15704
--- branches/5.2.x/core/units/forms/submission_log/submission_log_tp.php	(.../submission_log_tp.php)	(revision 15152)
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_tp.php	(.../submission_log_tp.php)	(revision 15704)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_tp.php 15152 2012-03-04 09:26:24Z alex $
+* @version	$Id: submission_log_tp.php 15704 2013-03-15 13:24:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -43,9 +43,13 @@
 			$object = $this->getObject($params);
 			/* @var $object kDBItem */
 
-			$reply_email = $this->Application->ConfigValue('SubmissionReplyFromEmail');
+			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
+			/* @var $form_submission_helper FormSubmissionHelper */
 
-			return $object->GetDBField('ToEmail') == $reply_email;
+			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
+			$form =& $form_submission_helper->getForm($form_submission);
+
+			return $object->GetDBField('ToEmail') == $form->GetDBField('ReplyFromEmail');
 		}
 
 		/**
Index: branches/5.2.x/core/units/helpers/form_submission_helper.php
===================================================================
diff -u -N -r15137 -r15704
--- branches/5.2.x/core/units/helpers/form_submission_helper.php	(.../form_submission_helper.php)	(revision 15137)
+++ branches/5.2.x/core/units/helpers/form_submission_helper.php	(.../form_submission_helper.php)	(revision 15704)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submission_helper.php 15137 2012-03-04 08:06:21Z alex $
+* @version	$Id: form_submission_helper.php 15704 2013-03-15 13:24:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -121,4 +121,27 @@
 
 			return $form;
 		}
+
+		/**
+		 * Returns form submission based on given submission log
+		 *
+		 * @param kDBItem $submission_log
+		 * @return kDBItem
+		 * @access public
+		 */
+		public function getSubmissionFromLog($submission_log)
+		{
+			$submission_id = $submission_log->GetDBField('FormSubmissionId');
+
+			$form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
+			/* @var $form_submission kDBItem */
+
+			if ( $form_submission->isLoaded() && ($form_submission->GetID() == $submission_id) ) {
+				return $form_submission;
+			}
+
+			$form_submission->Load($submission_id);
+
+			return $form_submission;
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php
===================================================================
diff -u -N -r15608 -r15704
--- branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 15608)
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 15704)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_eh.php 15608 2012-11-06 17:21:28Z alex $
+* @version	$Id: submission_log_eh.php 15704 2013-03-15 13:24:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -329,11 +329,10 @@
 				$this->_generateVerificationCode($object);
 			}
 
-			$form_submission =& $this->_getFormSubmission($object);
-
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
 			/* @var $form_submission_helper FormSubmissionHelper */
 
+			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 			$form =& $form_submission_helper->getForm($form_submission);
 
 			$send_params = Array (
@@ -454,11 +453,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$form_submission =& $this->_getFormSubmission($object);
-
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
 			/* @var $form_submission_helper FormSubmissionHelper */
 
+			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
+
 			$form =& $form_submission_helper->getForm($form_submission);
 			$reply_email = $form->GetDBField('ReplyFromEmail');
 
@@ -520,29 +519,6 @@
 		}
 
 		/**
-		 * Returns form submission by given event of submission log
-		 *
-		 * @param kDBItem $object
-		 * @return kDBItem
-		 */
-		function &_getFormSubmission(&$object)
-		{
-			$submission_id = $object->GetDBField('FormSubmissionId');
-
-			$form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
-			/* @var $form_submission kDBItem */
-
-			if ($form_submission->isLoaded() && ($form_submission->GetID() == $submission_id)) {
-				// already loaded AND has needed id
-				return $form_submission;
-			}
-
-			$form_submission->Load($submission_id);
-
-			return $form_submission;
-		}
-
-		/**
 		 * Sets last updated field for form submission
 		 *
 		 * @param kEvent $event
@@ -552,8 +528,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$form_submission =& $this->_getFormSubmission($object);
+			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
+			/* @var $form_submission_helper FormSubmissionHelper */
 
+			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
+
 			// 1. set last updated
 			$last_updated = max ($object->GetDBField('SentOn'), $object->GetDBField('RepliedOn'));
 
@@ -564,9 +543,6 @@
 			}
 
 			// 2. update submission status
-			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
-
 			$form =& $form_submission_helper->getForm($form_submission);
 			$client_responce = $form->GetDBField('ReplyFromEmail') == $object->GetDBField('ToEmail');
 			$replied = $object->GetDBField('ReplyStatus') == SUBMISSION_LOG_REPLIED;