--- squirrelmail-1.4.10/ChangeLog	2007-05-09 16:06:22.000000000 +0200
+++ squirrelmail-1.4.10a/ChangeLog	2007-05-10 10:28:31.000000000 +0200
@@ -2,6 +2,11 @@
 *** SquirrelMail Stable Series 1.4 ***
 **************************************
 
+Version 1.4.10a - 10 May 2007
+-----------------------------
+  - Fix regression in compose: when no alternative identities have been
+    defined, the From header would be incorrect. 
+
 Version 1.4.10 - 9 May 2007
 ---------------------------
   - Drop obsolete ORDB RBL from filters plugin (#1629398).
--- squirrelmail-1.4.10/functions/strings.php	2007-05-09 16:06:22.000000000 +0200
+++ squirrelmail-1.4.10a/functions/strings.php	2007-05-10 10:28:31.000000000 +0200
@@ -8,7 +8,7 @@
  *
  * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version $Id: strings.php 12372 2007-05-09 14:06:22Z kink $
+ * @version $Id: strings.php 12383 2007-05-10 08:28:31Z kink $
  * @package squirrelmail
  */
 
@@ -16,7 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.10';
+$version = '1.4.10a';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
--- squirrelmail-1.4.10/ReleaseNotes	2007-05-09 16:06:22.000000000 +0200
+++ squirrelmail-1.4.10a/ReleaseNotes	2007-05-10 10:28:31.000000000 +0200
@@ -1,7 +1,7 @@
 /*****************************************************************
- * Release Notes: SquirrelMail 1.4.10                            *
- * The "Visculamia" Release                                      *
- * 9 May 2007                                                    *
+ * Release Notes: SquirrelMail 1.4.10a                           *
+ * The "Visculamia Reloaded" Release                             *
+ * 10 May 2007                                                   *
  *****************************************************************/
 
 In this edition of SquirrelMail Release Notes:
@@ -16,13 +16,16 @@
 All about this release
 ======================
 
-This version, 1.4.10 is a maintenance release, addressing
+This version, 1.4.10a is a maintenance release, addressing
 the following problems since 1.4.9a:
 - Some security fixes (see below)
 - Small enhancements
 - A collection of bugfixes and stability enhancements
 (see ChangeLog for a full list)
 
+Version 1.4.10a was released shortly after 1.4.10 which
+had a regression in compose with just one identity defined.
+
 
 Locales / Translations / Charsets
 =================================
--- squirrelmail-1.4.10/src/compose.php	2007-05-09 15:46:30.000000000 +0200
+++ squirrelmail-1.4.10a/src/compose.php	2007-05-10 10:22:49.000000000 +0200
@@ -13,7 +13,7 @@
  *
  * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version $Id: compose.php 12370 2007-05-09 13:46:30Z kink $
+ * @version $Id: compose.php 12382 2007-05-10 08:22:49Z kink $
  * @package squirrelmail
  */
 
@@ -61,7 +61,9 @@
 sqgetGlobalVar('smaction',$action, $SQ_GLOBAL);
 sqgetGlobalVar('session',$session, $SQ_GLOBAL);
 sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL);
-sqgetGlobalVar('identity',$identity, $SQ_GLOBAL);
+if ( !sqgetGlobalVar('identity',$identity, $SQ_GLOBAL) ) {
+    $identity = 0;
+}
 sqgetGlobalVar('send_to',$send_to, $SQ_GLOBAL);
 sqgetGlobalVar('send_to_cc',$send_to_cc, $SQ_GLOBAL);
 sqgetGlobalVar('send_to_bcc',$send_to_bcc, $SQ_GLOBAL);