diff --git a/e107_admin/sql/core_sql.php b/e107_admin/sql/core_sql.php
index 07e76678f..ba6dbb22a 100644
--- a/e107_admin/sql/core_sql.php
+++ b/e107_admin/sql/core_sql.php
@@ -9,9 +9,9 @@
  * Core SQL
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/sql/core_sql.php,v $
- * $Revision: 1.30 $
- * $Date: 2009-11-04 03:07:39 $
- * $Author: e107coders $
+ * $Revision: 1.31 $
+ * $Date: 2009-11-04 20:19:11 $
+ * $Author: e107steved $
 */
 
 header("location:../index.php");
@@ -177,6 +177,48 @@ CREATE TABLE links (
 
 # --------------------------------------------------------
 
+
+
+#
+# Table structure for mailing-related tables
+#
+CREATE TABLE mail_recipients (
+	mail_target_id int(10) unsigned NOT NULL auto_increment,
+	mail_recipient_id int(10) unsigned NOT NULL default '0',
+	mail_recipient_email varchar(80) NOT NULL default '',
+	mail_recipient_name varchar(80) NOT NULL default '',
+	mail_status tinyint(1) unsigned NOT NULL default '0',
+	mail_detail_id int(10) unsigned NOT NULL default '0',
+	mail_send_date int(10) unsigned NOT NULL default '0',
+	mail_target_info text,
+	PRIMARY KEY (mail_target_id),
+	KEY mail_status (mail_status),
+	KEY mail_detail_id (mail_detail_id)
+) TYPE=MyISAM;
+
+CREATE TABLE mail_content (
+	mail_source_id int(10) unsigned NOT NULL auto_increment,
+	mail_content_status tinyint(1) unsigned NOT NULL default '0',
+	mail_togo_count int(10) unsigned NOT NULL default '0',
+	mail_sent_count int(10) unsigned NOT NULL default '0',
+	mail_fail_count int(10) unsigned NOT NULL default '0',
+	mail_bounce_count int(10) unsigned NOT NULL default '0',
+	mail_start_send int(10) unsigned NOT NULL default '0',
+	mail_end_send int(10) unsigned NOT NULL default '0',
+	mail_create_date int(10) unsigned NOT NULL default '0',
+	mail_creator int(10) unsigned NOT NULL default '0',
+	mail_create_app varchar(10) NOT NULL default '',
+	mail_e107_priority tinyint(1) unsigned NOT NULL default '0',
+	mail_last_date int(10) unsigned NOT NULL default '0',
+	mail_title varchar(100) NOT NULL default '',
+	mail_subject varchar(100) NOT NULL default '',
+	mail_body text,
+	mail_other text,
+	PRIMARY KEY (mail_source_id),
+	KEY mail_content_status (mail_content_status)
+) TYPE=MyISAM;
+
+
 #
 # Table structure for table `menus`
 #
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 1a4518b10..c640abe85 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,9 +9,9 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.64 $
- * $Date: 2009-11-04 17:29:26 $
- * $Author: secretr $
+ * $Revision: 1.65 $
+ * $Date: 2009-11-04 20:19:11 $
+ * $Author: e107steved $
  *
 */
 
@@ -714,7 +714,7 @@ class e_form
 
 		foreach($columnsArray as $key => $fld)
 		{
-			if(!varset($fld['forced']))
+			if (!varset($fld['forced']) && !vartrue($fld['hide']))
 			{
 				$checked = (in_array($key,$columnsDefault)) ?  TRUE : FALSE;
 				$text .= "
@@ -744,7 +744,7 @@ class e_form
         $count = 0;
 		foreach($fieldarray as $key=>$val)
 		{
-			if(in_array($key, $columnPref) || $key=='options' || varsettrue($val['forced']))
+			if ((in_array($key, $columnPref) || $key=='options' || varsettrue($val['forced'])) && !vartrue($val['hide']))
 			{
 				$class = vartrue($val['class']) ? ' class="'.$val['class'].'"' : '';
 				$text .= '
@@ -805,7 +805,7 @@ class e_form
         $ascdesc = (varset($ascdesc) == 'desc') ? 'asc' : 'desc';
 		foreach($fieldarray as $key=>$val)
 		{
-     		if(in_array($key, $columnPref) || $key == 'options' || (vartrue($val['forced'])))
+     		if ((in_array($key, $columnPref) || $key == 'options' || (vartrue($val['forced']))) && !vartrue($val['hide']))
 			{
 				$cl = (vartrue($val['thclass'])) ? " class='".$val['thclass']."'" : "";
 				$text .= "
diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php
index 62ccf8b10..e806cf15a 100644
--- a/e107_themes/templates/bbcode_template.php
+++ b/e107_themes/templates/bbcode_template.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/bbcode_template.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2009-09-19 15:21:50 $
-|     $Author: secretr $
+|     $Revision: 1.8 $
+|     $Date: 2009-11-04 20:19:11 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 // How to register your own BBcode button.
@@ -55,6 +55,16 @@ $BBCODE_TEMPLATE_ADMIN = "
 	<div class='field-spacer'><!-- --></div>
 ";
 
+$BBCODE_TEMPLATE_MAILOUT = "
+	{BB_HELP=admin}
+	<div class='field-spacer'><!-- --></div>
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}
+	{BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB_PREIMAGEDIR=".e_IMAGE."}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=shortcode}
+	<div class='field-spacer'><!-- --></div>
+";
+
 // $BBCODE_TEMPLATE_ADMIN .= "{BB=blank}";
 
 $BBCODE_TEMPLATE_NEWSPOST = "