diff --git a/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql b/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql
new file mode 100644
index 0000000000..70a19dd932
--- /dev/null
+++ b/migration/i2.0z/oracle/201403201438_IDEMPIERE-1828.sql
@@ -0,0 +1,250 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Mar 20, 2014 2:05:38 PM CET
+-- IDEMPIERE-1828
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202671,'b640b542-2f7a-4885-a212-5c60138d9480',0,'EMailFrom',TO_DATE('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','EMail sent from','EMail sent from',TO_DATE('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:01 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202672,'9c423548-1e6b-4899-a179-1304f30adeff',0,'RecipientTo',TO_DATE('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','To','To',TO_DATE('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:08 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202673,'6bc347b6-83fd-49e5-b34f-949f7e480baf',0,'RecipientCc',TO_DATE('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Cc','Cc',TO_DATE('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:18 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202674,'e79d13ad-54af-4384-9b11-dc86abd1db21',0,'RecipientBcc',TO_DATE('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Bcc','Bcc',TO_DATE('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:26 PM CET
+UPDATE AD_Element SET EntityType='D',Updated=TO_DATE('2014-03-20 14:06:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202673
+;
+
+-- Mar 20, 2014 2:08:07 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210985,'63925720-89dc-4245-86e6-770564e34147',202671,0,10,782,'EMailFrom',TO_DATE('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,'D','N',255,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','EMail sent from',0,0,TO_DATE('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:08:13 PM CET
+ALTER TABLE AD_UserMail ADD EMailFrom VARCHAR2(255) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:08:46 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210986,'6dd996b8-5e29-4bef-89b3-694bd8c1c9d6',202674,0,10,782,'RecipientBcc',TO_DATE('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_DATE('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:08:49 PM CET
+ALTER TABLE AD_UserMail ADD RecipientBcc VARCHAR2(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:09:05 PM CET
+UPDATE AD_Column SET AD_Element_ID=202673, ColumnName='RecipientCc', Description=NULL, Help=NULL, Name='Cc',Updated=TO_DATE('2014-03-20 14:09:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986
+;
+
+-- Mar 20, 2014 2:09:08 PM CET
+ALTER TABLE AD_UserMail ADD RecipientCc VARCHAR2(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:09:23 PM CET
+UPDATE AD_Column SET AD_Element_ID=202672, ColumnName='RecipientTo', Description=NULL, EntityType='D', Help=NULL, Name='To',Updated=TO_DATE('2014-03-20 14:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986
+;
+
+-- Mar 20, 2014 2:09:26 PM CET
+ALTER TABLE AD_UserMail ADD RecipientTo VARCHAR2(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:10:39 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210987,'b9fd6d34-671a-46cd-8abc-589c0eb256d5',202673,0,10,782,'RecipientCc',TO_DATE('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Cc',0,0,TO_DATE('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:10:41 PM CET
+ALTER TABLE AD_UserMail MODIFY RecipientCc VARCHAR2(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:10:57 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210988,'c9bb532c-3509-4791-a023-55fd661e348c',202674,0,10,782,'RecipientBcc',TO_DATE('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_DATE('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:11:00 PM CET
+ALTER TABLE AD_UserMail MODIFY RecipientBcc VARCHAR2(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:12:54 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202691,'76d0d102-0b78-44e9-a041-b38747b69ef0',0,709,2,TO_DATE('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_DATE('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:55 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202692,'dd367b6d-eb5e-44ab-a317-9b73987f4b60',0,709,5,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:56 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202693,'3aeedc4a-4272-412d-a971-2dc6e0fd7fd1',0,709,5,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_DATE('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:56 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202694,'70bae5b3-9321-44b9-b645-a3d1533d50c0',0,709,5,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:57 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202695,'e41d0273-fcb0-4784-a83b-ca1177532058',0,709,5,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_DATE('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202692
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202693
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202694
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202695
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12359
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=130,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12358
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11542
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11541
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202691
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202692
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202693
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202694
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202695
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=12359
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=12358
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=11542
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=11541
+;
+
+-- Mar 20, 2014 2:14:59 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202696,'ec3f809c-2519-4d75-b1c8-5e553f7fec10',0,53283,2,TO_DATE('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_DATE('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:14:59 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202697,'6596a658-1014-4f79-8420-099870dfd854',0,53283,5,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:00 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202698,'120d8134-50a7-4fa8-ab29-7a23f6f324e9',0,53283,5,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_DATE('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:00 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202699,'48af28b6-9a61-4655-addd-9479206028ae',0,53283,5,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:01 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202700,'1c8c16bf-f451-453e-9a85-1b8651733ddf',0,53283,5,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_DATE('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202697
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202698
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202699
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202700
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58024
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=130,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58025
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58026
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58027
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202696
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202697
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202698
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202699
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202700
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=58024
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=58025
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=58026
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=58027
+;
+
+SELECT register_migration_script('201403201438_IDEMPIERE-1828.sql') FROM dual
+;
diff --git a/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql b/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql
new file mode 100644
index 0000000000..a9c545591f
--- /dev/null
+++ b/migration/i2.0z/postgresql/201403201438_IDEMPIERE-1828.sql
@@ -0,0 +1,247 @@
+-- Mar 20, 2014 2:05:38 PM CET
+-- IDEMPIERE-1828
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202671,'b640b542-2f7a-4885-a212-5c60138d9480',0,'EMailFrom',TO_TIMESTAMP('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','EMail sent from','EMail sent from',TO_TIMESTAMP('2014-03-20 14:05:38','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:01 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202672,'9c423548-1e6b-4899-a179-1304f30adeff',0,'RecipientTo',TO_TIMESTAMP('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','To','To',TO_TIMESTAMP('2014-03-20 14:06:01','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:08 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202673,'6bc347b6-83fd-49e5-b34f-949f7e480baf',0,'RecipientCc',TO_TIMESTAMP('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Cc','Cc',TO_TIMESTAMP('2014-03-20 14:06:08','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:18 PM CET
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Element_UU,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,202674,'e79d13ad-54af-4384-9b11-dc86abd1db21',0,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Bcc','Bcc',TO_TIMESTAMP('2014-03-20 14:06:18','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:06:26 PM CET
+UPDATE AD_Element SET EntityType='D',Updated=TO_TIMESTAMP('2014-03-20 14:06:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202673
+;
+
+-- Mar 20, 2014 2:08:07 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210985,'63925720-89dc-4245-86e6-770564e34147',202671,0,10,782,'EMailFrom',TO_TIMESTAMP('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,'D','N',255,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','EMail sent from',0,0,TO_TIMESTAMP('2014-03-20 14:08:07','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:08:13 PM CET
+ALTER TABLE AD_UserMail ADD COLUMN EMailFrom VARCHAR(255) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:08:46 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210986,'6dd996b8-5e29-4bef-89b3-694bd8c1c9d6',202674,0,10,782,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_TIMESTAMP('2014-03-20 14:08:45','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:08:49 PM CET
+ALTER TABLE AD_UserMail ADD COLUMN RecipientBcc VARCHAR(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:09:05 PM CET
+UPDATE AD_Column SET AD_Element_ID=202673, ColumnName='RecipientCc', Description=NULL, Help=NULL, Name='Cc',Updated=TO_TIMESTAMP('2014-03-20 14:09:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986
+;
+
+-- Mar 20, 2014 2:09:08 PM CET
+ALTER TABLE AD_UserMail ADD COLUMN RecipientCc VARCHAR(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:09:23 PM CET
+UPDATE AD_Column SET AD_Element_ID=202672, ColumnName='RecipientTo', Description=NULL, EntityType='D', Help=NULL, Name='To',Updated=TO_TIMESTAMP('2014-03-20 14:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210986
+;
+
+-- Mar 20, 2014 2:09:26 PM CET
+ALTER TABLE AD_UserMail ADD COLUMN RecipientTo VARCHAR(2000) DEFAULT NULL 
+;
+
+-- Mar 20, 2014 2:10:39 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210987,'b9fd6d34-671a-46cd-8abc-589c0eb256d5',202673,0,10,782,'RecipientCc',TO_TIMESTAMP('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Cc',0,0,TO_TIMESTAMP('2014-03-20 14:10:38','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:10:41 PM CET
+INSERT INTO t_alter_column values('ad_usermail','RecipientCc','VARCHAR(2000)',null,'NULL')
+;
+
+-- Mar 20, 2014 2:10:57 PM CET
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,EntityType,FKConstraintType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSecure,IsSelectionColumn,IsSyncDatabase,IsToolbarButton,IsTranslated,IsUpdateable,Name,SeqNo,SeqNoSelection,Updated,UpdatedBy,Version) VALUES (0,210988,'c9bb532c-3509-4791-a023-55fd661e348c',202674,0,10,782,'RecipientBcc',TO_TIMESTAMP('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,'D','N',2000,'Y','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','Y','Bcc',0,0,TO_TIMESTAMP('2014-03-20 14:10:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Mar 20, 2014 2:11:00 PM CET
+INSERT INTO t_alter_column values('ad_usermail','RecipientBcc','VARCHAR(2000)',null,'NULL')
+;
+
+-- Mar 20, 2014 2:12:54 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202691,'76d0d102-0b78-44e9-a041-b38747b69ef0',0,709,2,TO_TIMESTAMP('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_TIMESTAMP('2014-03-20 14:12:54','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:55 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202692,'dd367b6d-eb5e-44ab-a317-9b73987f4b60',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:56 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202693,'3aeedc4a-4272-412d-a971-2dc6e0fd7fd1',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_TIMESTAMP('2014-03-20 14:12:55','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:56 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202694,'70bae5b3-9321-44b9-b645-a3d1533d50c0',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:12:57 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202695,'e41d0273-fcb0-4784-a83b-ca1177532058',0,709,5,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_TIMESTAMP('2014-03-20 14:12:56','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202692
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202693
+;
+
+-- Mar 20, 2014 2:13:40 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202694
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202695
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12359
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=130,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12358
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11542
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11541
+;
+
+-- Mar 20, 2014 2:13:41 PM CET
+UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2014-03-20 14:13:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202691
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202692
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202693
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202694
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202695
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=12359
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=12358
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=11542
+;
+
+-- Mar 20, 2014 2:14:13 PM CET
+UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=11541
+;
+
+-- Mar 20, 2014 2:14:59 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,60533,202696,'ec3f809c-2519-4d75-b1c8-5e553f7fec10',0,53283,2,TO_TIMESTAMP('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100,36,'D','Y','Y','N','N','N','N','N','N','N','AD_UserMail_UU',120,TO_TIMESTAMP('2014-03-20 14:14:58','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:14:59 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210985,202697,'6596a658-1014-4f79-8420-099870dfd854',0,53283,5,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,255,'D','Y','Y','Y','N','N','N','N','N','EMail sent from',130,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:00 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210986,202698,'120d8134-50a7-4fa8-ab29-7a23f6f324e9',0,53283,5,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','To',140,TO_TIMESTAMP('2014-03-20 14:14:59','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:00 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210987,202699,'48af28b6-9a61-4655-addd-9479206028ae',0,53283,5,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Cc',150,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:01 PM CET
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Field_UU,AD_Org_ID,AD_Tab_ID,ColumnSpan,Created,CreatedBy,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,Updated,UpdatedBy) VALUES (0,210988,202700,'1c8c16bf-f451-453e-9a85-1b8651733ddf',0,53283,5,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100,2000,'D','Y','Y','Y','N','N','N','N','N','Bcc',160,TO_TIMESTAMP('2014-03-20 14:15:00','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=80, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202697
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202698
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202699
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET IsDisplayed='Y', SeqNo=110, XPosition=1,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202700
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58024
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=130,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58025
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58026
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58027
+;
+
+-- Mar 20, 2014 2:15:55 PM CET
+UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2014-03-20 14:15:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202696
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=202697
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=202698
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=202699
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=202700
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=58024
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=58025
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=58026
+;
+
+-- Mar 20, 2014 2:16:28 PM CET
+UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=58027
+;
+
+SELECT register_migration_script('201403201438_IDEMPIERE-1828.sql') FROM dual
+;
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
index afc98f3aef..156f750708 100644
--- a/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserMail.java
@@ -128,6 +128,15 @@ public interface I_AD_UserMail
 	  */
 	public String getDeliveryConfirmation();
 
+    /** Column name EMailFrom */
+    public static final String COLUMNNAME_EMailFrom = "EMailFrom";
+
+	/** Set EMail sent from	  */
+	public void setEMailFrom (String EMailFrom);
+
+	/** Get EMail sent from	  */
+	public String getEMailFrom();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -176,6 +185,33 @@ public interface I_AD_UserMail
 	  */
 	public String getMessageID();
 
+    /** Column name RecipientBcc */
+    public static final String COLUMNNAME_RecipientBcc = "RecipientBcc";
+
+	/** Set Bcc	  */
+	public void setRecipientBcc (String RecipientBcc);
+
+	/** Get Bcc	  */
+	public String getRecipientBcc();
+
+    /** Column name RecipientCc */
+    public static final String COLUMNNAME_RecipientCc = "RecipientCc";
+
+	/** Set Cc	  */
+	public void setRecipientCc (String RecipientCc);
+
+	/** Get Cc	  */
+	public String getRecipientCc();
+
+    /** Column name RecipientTo */
+    public static final String COLUMNNAME_RecipientTo = "RecipientTo";
+
+	/** Set To	  */
+	public void setRecipientTo (String RecipientTo);
+
+	/** Get To	  */
+	public String getRecipientTo();
+
     /** Column name R_MailText_ID */
     public static final String COLUMNNAME_R_MailText_ID = "R_MailText_ID";
 
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index 51a06cd44d..eea3f1af16 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -735,6 +735,11 @@ public class MClient extends X_AD_Client
 		um.setAD_User_ID(to.getAD_User_ID());
 		um.setSubject(email.getSubject());
 		um.setMailText(email.getMessageCRLF());
+		um.setMailText(email.getMessageCRLF());
+		um.setEMailFrom(email.getFrom().toString());
+		um.setRecipientTo(MUserMail.getRecipientWithCommaSeparator(email.getTos()));
+		um.setRecipientCc(MUserMail.getRecipientWithCommaSeparator(email.getCcs()));
+		um.setRecipientBcc(MUserMail.getRecipientWithCommaSeparator(email.getBccs()));
 		if (email.isSentOK())
 			um.setMessageID(email.getMessageID());
 		else
diff --git a/org.adempiere.base/src/org/compiere/model/MUserMail.java b/org.adempiere.base/src/org/compiere/model/MUserMail.java
index 63f485536c..6b52180bad 100644
--- a/org.adempiere.base/src/org/compiere/model/MUserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/MUserMail.java
@@ -19,7 +19,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.util.Properties;
 
+import javax.mail.internet.InternetAddress;
+
 import org.compiere.util.EMail;
+import org.compiere.util.Env;
 
 /**
  * 	User Mail Model
@@ -31,7 +34,7 @@ public class MUserMail extends X_AD_UserMail
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -1019980049099249013L;
+	private static final long serialVersionUID = 925597416692485382L;
 
 	/**
 	 * 	Standard Constructor
@@ -67,6 +70,7 @@ public class MUserMail extends X_AD_UserMail
 		setClientOrg(parent);
 		setAD_User_ID(AD_User_ID);
 		setR_MailText_ID(parent.getR_MailText_ID());
+		setSenderAndRecipient(mail);
 		//
 		if (mail.isSentOK())
 			setMessageID(mail.getMessageID());
@@ -89,6 +93,7 @@ public class MUserMail extends X_AD_UserMail
 		setClientOrg(parent);
 		setAD_User_ID(AD_User_ID);
 		setW_MailMsg_ID(parent.getW_MailMsg_ID());
+		setSenderAndRecipient(mail);
 		//
 		if (mail.isSentOK())
 			setMessageID(mail.getMessageID());
@@ -112,6 +117,24 @@ public class MUserMail extends X_AD_UserMail
 		setAD_User_ID(AD_User_ID);
 		setSubject(mail.getSubject());
 		setMailText(mail.getMessageCRLF());
+		setSenderAndRecipient(mail);
+		//
+		if (mail.isSentOK())
+			setMessageID(mail.getMessageID());
+		else
+		{
+			setMessageID(mail.getSentMsg());
+			setIsDelivered(ISDELIVERED_No);
+		}
+	}	//	MUserMail
+	
+	public MUserMail (Properties ctx, EMail mail)
+	{
+		this (ctx, 0, null);
+		setAD_User_ID(Env.getAD_User_ID(ctx));
+		setSubject(mail.getSubject());
+		setMailText(mail.getMessageCRLF());
+		setSenderAndRecipient(mail);
 		//
 		if (mail.isSentOK())
 			setMessageID(mail.getMessageID());
@@ -155,4 +178,23 @@ public class MUserMail extends X_AD_UserMail
 		return s == null;
 	}	//	isDeliveredUnknown
 
+	/** Fill sender and recipients fields */
+	public void setSenderAndRecipient(EMail mail)
+	{
+		setEMailFrom(mail.getFrom().toString());
+		setRecipientTo(getRecipientWithCommaSeparator(mail.getTos()));
+		setRecipientCc(getRecipientWithCommaSeparator(mail.getCcs()));
+		setRecipientBcc(getRecipientWithCommaSeparator(mail.getBccs()));
+	}
+
+	static public String getRecipientWithCommaSeparator(InternetAddress[] recipients)
+	{
+		StringBuilder retValue = new StringBuilder("");
+		if (recipients != null) {
+			for (InternetAddress ia : recipients)
+				retValue.append(retValue.length() > 0 ? ", " : "" ).append(ia.getAddress());
+		}
+		return retValue.toString();
+	}
+
 }	//	MUserMail
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
index 4a55e15a62..0606c0d8ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
@@ -30,7 +30,7 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20131031L;
+	private static final long serialVersionUID = 20140716L;
 
     /** Standard Constructor */
     public X_AD_UserMail (Properties ctx, int AD_UserMail_ID, String trxName)
@@ -161,6 +161,20 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent
 		return (String)get_Value(COLUMNNAME_DeliveryConfirmation);
 	}
 
+	/** Set EMail sent from.
+		@param EMailFrom EMail sent from	  */
+	public void setEMailFrom (String EMailFrom)
+	{
+		set_Value (COLUMNNAME_EMailFrom, EMailFrom);
+	}
+
+	/** Get EMail sent from.
+		@return EMail sent from	  */
+	public String getEMailFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_EMailFrom);
+	}
+
 	/** IsDelivered AD_Reference_ID=319 */
 	public static final int ISDELIVERED_AD_Reference_ID=319;
 	/** Yes = Y */
@@ -216,6 +230,48 @@ public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent
 		return (String)get_Value(COLUMNNAME_MessageID);
 	}
 
+	/** Set Bcc.
+		@param RecipientBcc Bcc	  */
+	public void setRecipientBcc (String RecipientBcc)
+	{
+		set_Value (COLUMNNAME_RecipientBcc, RecipientBcc);
+	}
+
+	/** Get Bcc.
+		@return Bcc	  */
+	public String getRecipientBcc () 
+	{
+		return (String)get_Value(COLUMNNAME_RecipientBcc);
+	}
+
+	/** Set Cc.
+		@param RecipientCc Cc	  */
+	public void setRecipientCc (String RecipientCc)
+	{
+		set_Value (COLUMNNAME_RecipientCc, RecipientCc);
+	}
+
+	/** Get Cc.
+		@return Cc	  */
+	public String getRecipientCc () 
+	{
+		return (String)get_Value(COLUMNNAME_RecipientCc);
+	}
+
+	/** Set To.
+		@param RecipientTo To	  */
+	public void setRecipientTo (String RecipientTo)
+	{
+		set_Value (COLUMNNAME_RecipientTo, RecipientTo);
+	}
+
+	/** Get To.
+		@return To	  */
+	public String getRecipientTo () 
+	{
+		return (String)get_Value(COLUMNNAME_RecipientTo);
+	}
+
 	public org.compiere.model.I_R_MailText getR_MailText() throws RuntimeException
     {
 		return (org.compiere.model.I_R_MailText)MTable.get(getCtx(), org.compiere.model.I_R_MailText.Table_Name)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
index 6f42ca31af..51b16ac8f6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
@@ -521,6 +521,8 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 				//
 				if (m_user != null)
 					new MUserMail(m_user, m_user.getAD_User_ID(), email).saveEx();
+				else
+					new MUserMail(Env.getCtx(), email).saveEx();
 				if (email.isSentOK())
 				{
 					FDialog.info(0, this, "MessageSent");