diff --git a/src/www/dragonfly-debug.html b/src/www/dragonfly-debug.html
index 6523a35..57fd7b4 100644
--- a/src/www/dragonfly-debug.html
+++ b/src/www/dragonfly-debug.html
@@ -177,7 +177,8 @@
             <tr>
 	      <td colspan="3">
 		<a id="login-console-href" href="javascript:void(Dragonfly.toggleConsole());">Console</a> / 
-		<a id="login-logs-href" href="javascript:void(createLoggingPane(true));">Logs</a>
+		<a id="login-logs-href" href="javascript:void(createLoggingPane(true));">Logs</a> / 
+		<a href="dragonfly.html">Compiled</a>
 	      </td>
             </tr>
         </table>
@@ -254,7 +255,6 @@
       <a id="source">Source</a>
       | <a href="javascript:void(Dragonfly.toggleConsole());">Console</a>
       | <a href="javascript:void(createLoggingPane(true));">Logs</a>
-      | <a href="dragonfly.html">Compiled</a>
     </div>
     <form name="webkitKludge"></form>
   </body>
diff --git a/src/www/dragonfly.html b/src/www/dragonfly.html
index 1be932d..e3de62b 100644
--- a/src/www/dragonfly.html
+++ b/src/www/dragonfly.html
@@ -21,12 +21,11 @@ var subObjs=objs[module];for(var i=0;i < objs[module].length;i++){var subModule=
 '<ul>' ];for(var i=0;i < missing.length;i++){html.push ('<li>', missing[i], '</li>');}
 html.push ('</ul>',
 '<p>You may want to contact your administrator.  More details may be available in your JavaScript Console.</p>');document.write (html.join(''));document.getElementById ('loading').style.display = 'none';}else{addLoadEvent (Dragonfly.main);}})();// --></script><iframe id="history-iframe" style="display: none;"></iframe><form id="interpreter_form" style="display: none" autocomplete="off"><div id="interpreter_area"><div id="interpreter_output"></div></div><div id="oneline"><input id="interpreter_text" name="input_text" type="text" class="textbox" size="100" autocomplete="off"></div><div id="multiline" style="display: none"><textarea id="interpreter_textarea" name="input_textarea" class="textbox" cols="97" rows="10"></textarea><br /></div></form><div id="login-pane" style="display: none;"><div id="login-bg-top"></div><div id="login-bg-bottom"></div><h1 id="login-logo">Bongo</h1><h4 id="login-message">&nbsp;</h4><table cellpadding="0" cellspacing="6" summary=""><tr><th><label id="login-user-label"></label></th><td colspan="2"><input type="text" class="text-entry" id="login-user" style="width: 98%;"></td></tr><tr><th><label id="login-password-label"></label></th><td colspan="2"><input type="password" class="text-entry" id="login-password" style="width: 98%;"></td></tr><tr><tr><th><label id="login-language-label"></label></th><td colspan="2"><select id="login-language" style="width: 100%;"><option value="en">English</option><option value="fr">Fran&ccedil;ais</option></select></td></tr><tr><td class="default" colspan="3" style="text-align: right;"><input id="login-default" type="checkbox"><label for="login-default" id="login-default-label"></label></td></tr><tr><td colspan="3"><input type="button" value="Log In" id="login-button" style="float: right;"><span id="status-indicator"><img src="img/ajax-loader.gif" style="float: right;"></span></td></tr><tr><td colspan="3"><a id="login-console-href" href="javascript:void(Dragonfly.toggleConsole());">Console</a> / 
-		<a id="login-logs-href" href="javascript:void(createLoggingPane(true));">Logs</a></td></tr></table></div><div id="content" style="display: none"><div id="notification">Notification</div><table id="page-frame" cellspacing="0" cellpadding="0"><tr id="page-header"><td id="logo" class="header-cell" colspan="2"><table cellspacing="0" cellpadding="0"><tr><td width="100%"><span id="user-name"></span><ul id="section-user"><li><a href="#preferences" id="settings-text">Settings</a></li><li id="admin-link"><a href="admin" target="_blank" id="admin-text">Administration</a></li><li><a href="javascript:void(Dragonfly.logout());" id="logout-text">Log Out</a></li><!-- 
+		<a id="login-logs-href" href="javascript:void(createLoggingPane(true));">Logs</a> / <a href="dragonfly-debug.html">Uncompiled</a></td></tr></table></div><div id="content" style="display: none"><div id="notification">Notification</div><table id="page-frame" cellspacing="0" cellpadding="0"><tr id="page-header"><td id="logo" class="header-cell" colspan="2"><table cellspacing="0" cellpadding="0"><tr><td width="100%"><span id="user-name"></span><ul id="section-user"><li><a href="#preferences" id="settings-text">Settings</a></li><li id="admin-link"><a href="admin" target="_blank" id="admin-text">Administration</a></li><li><a href="javascript:void(Dragonfly.logout());" id="logout-text">Log Out</a></li><!-- 
 		Feedback disabled. Check the destination address in Dragonfly.js
 		when re-enabled.
 		<li><a href="javascript:void(Dragonfly.sendFeedback());">Send Feedback</a></li> --></ul></td><td style="text-align: right; padding-right: 15px;"><div id="search"><input id="search-entry" type="search" placeholder="Search Bongo" autosave="BongoSearch" results="10"><input type="button" id="bongosearch" onclick="void(Dragonfly.search ($('search-entry').value))" value="Search"></div></div></td></table></td></tr><tr><td id="section-sidebar"><div id="sidebar-nav"><span class="t"><span class="tr"></span></span><span class="c"><span class="cr"></span></span><span class="b"><span class="br"></span></span><div id="sidebar-tabs-large"><div class="tab" id="summary-tab"><a id="summary-tab-href" href="#summary" title="Look at an overview of your mail and events"><strong id="summary-tab-label">Summary</strong></a></div><div class="tab" id="mail-tab"><a id="mail-tab-href" href="#mail" title="Read your mail"><strong id="mail-tab-label">Mail</strong></a></div><div class="action"><a id="compose-tab" href="mailto:">Compose New Mail</a></div><div class="tab-spacer"></div><div class="tab" id="calendar-tab"><a id="calendar-tab-href" href="#calendar" title="View your calendar"><strong id="calendar-tab-label">Calendar</strong></a></div><div class="action"><a id="new-event-href" href="javascript:void(Dragonfly.Calendar.newEvent())">Create New Event</a></div></div><div id="sidebar-tabs-small">
 		  Show: <select id="sidebar-select"><option value="summary" id="summary-tab-label-alt">Summary</option><option value="mail" id="mail-tab-label-alt">Mail</option><option value="calendar" id="calendar-tab-label-alt">Calendar</option><option value="search" id="sidebar-select-search">Search</option></select><p>
 		    New: <a href="mailto:">Mail</a> | <a href="javascript:void(Dragonfly.Calendar.newEvent())">Event</a></p></div></div><div id="sidebox-calendar"></div><div id="sidebox-sidebook"></div></td><td id="section-content" colspan="2"><div id="sourcebar"></div><div id="toolbar"></div><div id="content-iframe"></div></td></tr></table></div><div id="extra" style="display: none"><a id="source">Source</a>
       | <a href="javascript:void(Dragonfly.toggleConsole());">Console</a>
-      | <a href="javascript:void(createLoggingPane(true));">Logs</a>
-      | <a href="dragonfly-debug.html">Uncompiled</a></div><form name="webkitKludge"></form></body></html>
+      | <a href="javascript:void(createLoggingPane(true));">Logs</a></div><form name="webkitKludge"></form></body></html>
diff --git a/src/www/js/Composer.js b/src/www/js/Composer.js
index a5c7def..542cc25 100644
--- a/src/www/js/Composer.js
+++ b/src/www/js/Composer.js
@@ -15,6 +15,8 @@ Dragonfly.Mail.Composer = function (parent, msg)
     this.isReply = this.msg.isReply;
 
     this.pendingAttachments = [ ];
+    
+    logDebug('Composer instantiated.');
 
     if (parent) {
         d.HtmlBuilder.buildChild (parent, this);
@@ -352,13 +354,19 @@ Dragonfly.Mail.Composer.prototype.discardDraft = function (evt)
                   return jsob;
               }, this),
         bind (function (err) {
-                  if (!(err instanceof CancelledError)) {
+                  // Ignore the fact we errored - probably because we NEVER SAVED ANYTHING.
+                  /*if (!(err instanceof CancelledError)) {
                       d.notifyError ('Could not discard draft');
                       logDebug ('error deleting draft:', d.reprError (err));
                   }
                   this.state = c.MaybeDirty;
                   this.scheduleSave();
-                  return err;
+                  return err;*/
+                  
+                  // Now, go do what success normally does.
+                  this.state = c.Discarded;
+                  d.go (discardLoc);
+                  return jsob;
               }, this));
 };
 
@@ -530,13 +538,15 @@ Dragonfly.Mail.Composer.composeNew = function (msg)
     var html = new d.HtmlBuilder ('<table class="conversation-list" cellpadding="0" cellspacing="0"><tr class="group-header"><td>',
                                   fakeLoc.getBreadCrumbs(),
                                   '</td></tr></table>',
-                                  '<div id="conv-msg-list" class="scrollv">');
+                                  '<div id="conv-msg-list" class="scrollv"><div id="mail-list-wrapper" class="scrollv">');
 
     var composer = new m.Composer (html, msg);
 
-    html.push ('</div>');
+    html.push ('</div></div>');
     html.set ('content-iframe');
-
+    
+    d.resizeScrolledView();
+    
     return composer;
 };
 
diff --git a/src/www/js/Mail.js b/src/www/js/Mail.js
index 6693be1..adae24d 100644
--- a/src/www/js/Mail.js
+++ b/src/www/js/Mail.js
@@ -19,6 +19,8 @@ Dragonfly.Mail.setLabels = {
 
 Dragonfly.Mail.getView = function (loc)
 {
+    logDebug('Dragonfly.Mail.getView(loc) called.');
+    
     var d = Dragonfly;
     var m = d.Mail;
 
@@ -51,12 +53,6 @@ Dragonfly.Mail.getView = function (loc)
             ret = m.MultiListView;
         }
     }
-    else if (loc.handler == 'conversations')
-    {
-        // Fake ConversationView for Composer.
-        // (so we can get Dragonfly.Mail.ConversationView.getScrolledElement called)
-        ret = m.ConversationView;
-    }
     else 
     {
         ret = m.ListView;
diff --git a/src/www/js/Preferences.js b/src/www/js/Preferences.js
index 8eb5e61..146d71b 100644
--- a/src/www/js/Preferences.js
+++ b/src/www/js/Preferences.js
@@ -264,7 +264,7 @@ Dragonfly.Preferences.Editor.build = function (loc)
         // Come up with some magic tabs!
         var notebook = new d.Notebook();
         var userpage = notebook.appendPage('About Me');
-        var composerpage = notebook.appendPage('Composer');
+        var composerpage = notebook.appendPage('Mail');
         var calendarpage = notebook.appendPage('Calendar');
         
         var userhtml = new d.HtmlBuilder ();
@@ -278,9 +278,17 @@ Dragonfly.Preferences.Editor.build = function (loc)
         
         var composerhtml = new d.HtmlBuilder ();
         composerhtml.push ('<table border="0" cellspacing="0">', 
-            '<tr><td><label>Default sent address:</label></td>', 
-            '<td><input type="text" id="from"></td></tr>', 
+            '<tr><td><label>From address:</label></td>', 
+            '<td><input type="text" id="from" /></td></tr>', 
             '<tr><td colspan="2"><span style="font-size: 80%;">Please don\'t abuse the above feature for now.</span></td></tr>',
+            '<tr><td><label>Auto BCC:</label></td>',
+            '<td><input type="text" id="autobcc" /></td></tr>',
+            '<tr><td><label>Signature:</label></td>',
+            '<td><textarea rows="3" cols="30" id="signature"></textarea><br />',
+            '<input type="checkbox" id="usesig" name="usesig" /><label for="usesig">Apply signature to outgoing mail</label>',
+            '</td></tr>',
+            '<tr><td><label>Show HTML messages:</label></td>',
+            '<td><select id="htmlmsg"><option value="show">Yes</option><option value="ptext">Prefer plain-text</option><option value="hide">No</option></select></td></tr>',
             '</table>');
         composerhtml.set (composerpage);