Index: branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php
===================================================================
diff -u -N -r13823 -r13824
--- branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 13823)
+++ branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 13824)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_config.php 13823 2010-07-12 18:37:49Z alex $
+* @version	$Id: form_submissions_config.php 13824 2010-07-12 18:43:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -133,8 +133,20 @@
 
 		    			'LastUpdatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 		    			'Notes' => Array ('type' => 'string', 'default' => NULL),
+		    			'MessageId' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
 					),
-					'VirtualFields'	=>	Array(
+					'VirtualFields'	=>	Array (
+						'MergeToSubmission' => Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter', 'options' => Array (),
+							'default' => NULL
+						),
+
+						'IsMergeToSubmission' => Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+							'default' => 0
+						),
 					),
 					'CalculatedFields'	=>	Array(
 					),