diff --git a/admin/communication.php b/admin/communication.php
index 4e9ce014..a179b552 100644
--- a/admin/communication.php
+++ b/admin/communication.php
@@ -22,9 +22,259 @@
 */
 ?>
 <?
- require("../common.inc.php");
+ require_once("../common.inc.php");
  require_once("../user.inc.php");
  user_auth_required('committee', 'admin');
+
+/* dialog_choose
+ * select:  comm_dialog_choose_select(emails_id) 
+ * cancel:  comm_dialog_choose_cancel() */
+
+switch($_GET['action']) {
+case 'dialog_choose_load':
+	$emails_id = intval($_GET['emails_id']);
+	$q = mysql_query("SELECT * FROM emails WHERE id='$emails_id'");
+	$e = mysql_fetch_assoc($q);
+	?>
+	<table class="editor">
+	<tr><td class="label" style="width:15%"><?=i18n('Name')?>:</td><td class="input"><?=$e['name']?></td></tr>
+	<tr><td class="label"><?=i18n('Subject')?>:</td><td class="input"><?=$e['subject']?></td></tr>
+	<tr><td class="label"><?=i18n('From Address')?>:</td><td class="input"><?=$e['from']?></td></tr>
+	<tr><td></td><td>
+		<div style="border:1px solid black; overflow:auto; height=300px;"><?=$e['bodyhtml']?></div>
+	</td></tr></table>
+	<?
+	exit;
+
+case 'dialog_choose':
+	?>
+	<div id="comm_dialog_choose" title="Select a Communication" style="display: none">
+	<h4><?=i18n("Select a Communication")?>:</h4>
+	<form id="choose" onchange="dialog_choose_change()" onkeypress="dialog_choose_change()" >
+	<table style="width:100%"><tr><td>
+	<select id="comm_dialog_choose_emails_id">
+		<option value="-1">-- <?=i18n('Choose a Communication')?> --</option>
+	<?
+	$type = mysql_real_escape_string($_GET['type']);
+	$q = mysql_query("SELECT * FROM emails WHERE type='$type'");
+	while($e = mysql_fetch_assoc($q)) {
+		echo "<option value=\"{$e['id']}\">{$e['name']}</option>";
+	}
+	?>
+	</select>
+	</td><td style="text-align:right">
+	<input class="comm_dialog_choose_email_button" disabled="disabled" type="submit" value="<?=i18n('Choose')?>" >
+	<input class="comm_dialog_choose_cancel_button" type="submit" value="<?=i18n('Cancel')?>" >
+	</td></tr></table>
+	<hr />
+	<div id="comm_dialog_choose_info"></div>
+	<hr />
+	<input class="comm_dialog_choose_email_button" disabled="disabled" type="submit" value="<?=i18n('Choose')?>" >
+	<input class="comm_dialog_choose_cancel_button" type="submit" value="<?=i18n('Cancel')?>" >
+	</form>
+	</div>
+	<script type="text/javascript">
+		$(".comm_dialog_choose_email_button").click(function () { 
+						var sel = $("#comm_dialog_choose_emails_id").val();
+						$('#comm_dialog_choose').dialog("close");
+						comm_dialog_choose_select(sel);
+						return false;
+					});
+		$(".comm_dialog_choose_cancel_button").click(function () { 
+						$('#comm_dialog_choose').dialog("close");
+						comm_dialog_choose_close();
+						return false;
+					});
+	
+
+		function dialog_choose_change()
+		{
+			var sel = $("#comm_dialog_choose_emails_id").val();
+			$("#comm_dialog_choose_info").html("Loading...");
+			$("#comm_dialog_choose_info").load("<?=$config['SFIABDIRECTORY']?>/admin/communication.php?action=dialog_choose_load&emails_id="+sel);
+			if(sel == -1) {
+				$(".comm_dialog_choose_email_button").attr('disabled','disabled');
+			} else {
+				$(".comm_dialog_choose_email_button").removeAttr('disabled');
+			}
+	        return false;
+		}
+
+		function dialog_choose_open()
+		{
+			var w = (document.documentElement.clientWidth * 0.8);
+			var h = (document.documentElement.clientHeight * 0.8);
+			$('#comm_dialog_choose').dialog('option', 'width', w);
+			$('#comm_dialog_choose').dialog('option', 'height', h);
+			$("#comm_dialog_choose").dialog('open');
+		}
+
+		$("#comm_dialog_choose").dialog({
+				bgiframe: true, autoOpen: false,
+				modal: true, resizable: false,
+				draggable: false,
+				close: function() {
+						$(this).dialog('destroy');
+						$('#comm_dialog_choose').remove();
+						comm_dialog_choose_cancel();
+						}
+				});
+
+		dialog_choose_open();
+
+
+	</script>
+	<?
+	exit;
+
+case 'email_save':
+	print_r($_POST);
+	$id = intval($_POST['emails_id']);
+	$name = mysql_real_escape_string($_POST['name']);
+	$description = mysql_real_escape_string($_POST['description']);
+	$from = mysql_real_escape_string($_POST['from']);
+	$subject = mysql_real_escape_string($_POST['subject']);
+	$bodyhtml = mysql_real_escape_string($_POST['bodyhtml']);
+	$type = mysql_real_escape_string($_POST['type']);
+
+	if($id == 0) {
+		mysql_query("INSERT INTO emails(type) VALUES('$type')");
+		echo mysql_error();
+		$id = mysql_insert_id();
+	}
+	mysql_query("UPDATE emails SET name='$name',description='$description',
+								`from`='$from',subject='$subject',bodyhtml='$bodyhtml'
+						WHERE id='$id'");
+	echo mysql_error();
+	happy_("Email Saved");
+	exit;
+
+case 'dialog_edit':
+	$clone_id = 0;
+	if(array_key_exists('id', $_GET)) {
+		$id = intval($_GET['id']);
+		$q = mysql_query("SELECT * FROM emails WHERE id='$id'");
+	} else if(array_key_exists('key', $_GET)) {
+		$key = mysql_real_escape_string($_GET['key']);
+		$q = mysql_query("SELECT * FROM emails WHERE val='$key'");
+	} else if(array_key_exists('clone_id', $_GET)) {
+		$clone_id = intval($_GET['clone_id']);
+		$q = mysql_query("SELECT * FROM emails WHERE id='$clone_id'");
+	} else {
+		/* New email */
+		$q = NULL;
+	}
+	if($q != NULL) {
+		if(mysql_num_rows($q) != 1) {
+			echo "Ambiguous edit";
+			exit;
+		}
+		$e = mysql_fetch_assoc($q);
+		$emails_id = $e['id'];
+		$name = htmlspecialchars($e['name']);
+		$description = htmlspecialchars($e['description']);
+		$from = htmlspecialchars($e['from']);
+		$subject = htmlspecialchars($e['subject']);
+		$body = $e['body'];
+		$bodyhtml = $e['bodyhtml'];
+		if($bodyhtml == '') $bodyhtml = $body;
+
+		/* If we're supposed to clone it, load it then zero out the
+		 * id so we make a new record on save */
+		if($clone_id) $emails_id = 0;
+	}
+	/* Load a type if specified, if not, default to use */
+	$type = (array_key_exists('type',$_GET)) ? $_GET['type'] : 'user';
+
+
+	?>
+	<div id="comm_dialog_edit" title="Edit a Communication" style="display: none">
+	<br />
+	<form id="comm_dialog_edit_form">
+	<input type="hidden" name="emails_id" value="<?=$emails_id?>" />
+	<input type="hidden" name="type" value="<?=$type?>" />
+	<table class="editor" style="width:95%"><tr>
+		<td class="label"><?=i18n("Email Name")?>:</td>
+		<td class="input"><input type="text" name="name" size="60" value="<?=$name?>" /></td>
+	</tr><tr>
+		<td class="label"><?=i18n("Description")?>:</td>
+		<td class="input"><input type="text" name="description" size="60" value="<?=$description?>" /></td>
+	</tr><tr>
+		<tr><td colspan="2"><hr /></td>
+	</tr><tr>
+		<td class="label"><?=i18n("Email Subject")?>:</td>
+		<td class="input"><input type="text" name="subject" size="60" value="<?=$subject?>" /></td>
+	</tr><tr>
+		<td class="label"><?=i18n("From Address")?>:</td>
+		<td class="input"><input type="text" name="from" size="60" value="<?=$from?>" /></td>
+	</tr><tr>
+		<td class="label"><?=i18n("Email Body")?>:</td>
+		<td class="input"><?
+		/*
+			require_once("../fckeditor/fckeditor.php");
+			$oFCKeditor = new FCKeditor("bodyhtml") ;
+			$oFCKeditor->BasePath = "../fckeditor/";
+			$oFCKeditor->ToolbarSet = 'sfiab';
+			$oFCKeditor->Value = $bodyhtml;
+			$oFCKeditor->Width="100%";
+			$oFCKeditor->Height=300;
+			$oFCKeditor->Create();*/
+		?>
+		<textarea name="bodyhtml" rows=6 cols=80><?=$bodyhtml?></textarea>
+		
+		</td>
+	</tr></table>
+	<hr />
+	<div align="right">
+		<input type="submit" id="comm_dialog_edit_save_button" value="<?=i18n('Save')?>" />
+		<input type="submit" id="comm_dialog_edit_cancel_button" value="<?=i18n('Cancel')?>" />
+	</div>
+	</form>
+	</div>
+	<script type="text/javascript">
+		$("#comm_dialog_edit_save_button").click(function () { 
+						$("#debug").load("<?=$config['SFIABDIRECTORY']?>/admin/communication.php?action=email_save", $("#comm_dialog_edit_form").serializeArray(),
+									function() {
+										$('#comm_dialog_edit').dialog("close");
+									});
+						return false;
+					}
+				);
+		$("#comm_dialog_edit_cancel_button").click(function () { 
+						$('#comm_dialog_edit').dialog("close");
+						return false;
+					}
+				);
+
+		function comm_dialog_edit_open()
+		{
+			var w = 800; //(document.documentElement.clientWidth * 0.8);
+			var h = (document.documentElement.clientHeight * 0.8);
+			$('#comm_dialog_edit').dialog('option', 'width', w);
+			$('#comm_dialog_edit').dialog('option', 'height', h);
+			$("#comm_dialog_edit").dialog('open');
+		}
+		$("#comm_dialog_edit").dialog({
+				bgiframe: true, autoOpen: false,
+				modal: true, resizable: false,
+				draggable: false,
+				close: function() {
+							$(this).dialog('destroy');
+							$('#comm_dialog_edit').remove();
+						}
+				});
+
+		comm_dialog_edit_open();
+
+
+	</script>
+	<?
+	exit;
+
+}
+ 
+
+
  include "communication.inc.php";
  send_header("Communication",
  		array('Committee Main' => 'committee_main.php',
@@ -254,19 +504,29 @@
 
 	if(!$from && $config['fairmanageremail']) $from="Fair Manager <".$config['fairmanageremail'].">";
 
-	echo "<table>";
-	echo "<tr><td>".i18n("Email Name")."</td><td><input type=\"text\" name=\"name\" size=\"60\" value=\"$name\" /></td></tr>\n";
-	echo "<tr><td>".i18n("Email Key")."</td><td>";
+	echo "<table class=\"editor\">";
+	echo "<tr><td style=\"width:10\%\">".i18n("Email Name").":</td><td><input type=\"text\" name=\"name\" size=\"60\" value=\"$name\" /></td></tr>\n";
+	echo "<tr><td>".i18n("Email Key").":</td><td>";
 	if($r->type=="system")
 		echo $val;
 	else
 		echo "<input type=\"text\" name=\"val\" size=\"40\" value=\"$val\" /> (must be unique)";
 	echo "</td></tr>\n";
-	echo "<tr><td>".i18n("Email Description")."</td><td><input type=\"text\" name=\"description\" size=\"60\" value=\"$description\" /></td></tr>\n";
+	echo "<tr><td>".i18n("Email Description").":</td><td><input type=\"text\" name=\"description\" size=\"60\" value=\"$description\" /></td></tr>\n";
 	echo "<tr><td colspan=\"2\"><hr /></td></tr>";
-	echo "<tr><td>".i18n("Email Subject")."</td><td><input type=\"text\" name=\"subject\" size=\"60\" value=\"$subject\" /></td></tr>\n";
-	echo "<tr><td>".i18n("Email From")."</td><td><input type=\"text\" name=\"from\" size=\"60\" value=\"$from\" /></td></tr>\n";
-	echo "<tr><td>".i18n("Email Body")."</td><td><textarea name=\"body\" cols=\"80\" rows=\"10\" style=\"font-size: 0.75em\">".htmlspecialchars($body)."</textarea></td></tr>";
+	echo "<tr><td>".i18n("Email Subject").":</td><td><input type=\"text\" name=\"subject\" size=\"60\" value=\"$subject\" /></td></tr>\n";
+	echo "<tr><td>".i18n("Email From").":</td><td><input type=\"text\" name=\"from\" size=\"60\" value=\"$from\" /></td></tr>\n";
+//	echo "<tr><td>".i18n("Email Body")."</td><td><textarea name=\"body\" cols=\"80\" rows=\"10\" style=\"font-size: 0.75em\">".htmlspecialchars($body)."</textarea></td></tr>";
+	echo "<tr><td>".i18n("Email Body").":</td><td>";
+	require_once("../fckeditor/fckeditor.php");
+	$oFCKeditor = new FCKeditor("body") ;
+	$oFCKeditor->BasePath  = "../fckeditor/";
+	$oFCKeditor->Value = $body;
+	$oFCKeditor->Width="100%";
+	$oFCKeditor->Height=300;
+	$oFCKeditor->Create();
+	echo "</td></tr>";
+
 	echo "<tr><td colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"".$buttontext."\"></td></tr>";
 	echo "</table>";
 	echo "</form>";
diff --git a/admin/fundraising_campaigns.php b/admin/fundraising_campaigns.php
index 660be69a..a9f9d0c7 100644
--- a/admin/fundraising_campaigns.php
+++ b/admin/fundraising_campaigns.php
@@ -664,6 +664,7 @@ function prospect_removeall() {
 //key is initial or followup
 //start is either 'new' to start with a blank, or 'existing' to load an existing email to start from
 function opencommunicationeditor(key,id) {
+	$("#dialog").empty();
 	if(id) {
 		$("#dialog").load("communication.php?action=dialog_edit&id="+id,null,function() {
 		});
@@ -674,6 +675,7 @@ function opencommunicationeditor(key,id) {
 }
 
 function opencommunicationchooser() {
+	$("#dialog").empty();
 		$("#dialog").load("communication.php?action=dialog_choose&type=fundraising",null,function() {
 		});
 }
@@ -688,8 +690,7 @@ function removecommunication(id) {
 function comm_dialog_choose_select(id) {
 	alert('im back with email id: '+id);
 	//get rid of hte html
-	$("#dialog").html("");
-
+	$("#dialog").empty();
 	$("#dialog").load("communication.php?action=dialog_edit&cloneid="+id,null,function() {
 	});
 }
diff --git a/fckeditor/fckconfig.js b/fckeditor/fckconfig.js
index 89a92b17..dbd3356c 100644
--- a/fckeditor/fckconfig.js
+++ b/fckeditor/fckconfig.js
@@ -112,13 +112,28 @@ FCKConfig.ToolbarSets["Default"] = [
 	'/',
 	['Style','FontFormat','FontName','FontSize'],
 	['TextColor','BGColor'],
-	['FitWindow','ShowBlocks','-','About']		// No comma for the last row.
+	['FitWindow','ShowBlocks']		// No comma for the last row.
 ] ;
 
 FCKConfig.ToolbarSets["Basic"] = [
 	['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
 ] ;
 
+FCKConfig.ToolbarSets["sfiab"] = [
+	['Cut','Copy','Paste'],
+	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	['Source'],
+	'/',
+	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
+	['OrderedList','UnorderedList','-','Outdent','Indent'],
+	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+	['Link','Unlink'],
+	['TextColor','BGColor'],
+	['Image','Table'],
+	['Style','FontFormat','FontName','FontSize']
+] ;
+
+
 FCKConfig.EnterMode = 'p' ;			// p | div | br
 FCKConfig.ShiftEnterMode = 'br' ;	// p | div | br