diff --git a/workflow/engine/classes/model/EmailEvent.php b/workflow/engine/classes/model/EmailEvent.php
new file mode 100644
index 000000000..712fac876
--- /dev/null
+++ b/workflow/engine/classes/model/EmailEvent.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once 'classes/model/om/BaseEmailEvent.php';
+
+
+/**
+ * Skeleton subclass for representing a row from the 'EMAIL_EVENT' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class EmailEvent extends BaseEmailEvent {
+
+} // EmailEvent
diff --git a/workflow/engine/classes/model/EmailEventPeer.php b/workflow/engine/classes/model/EmailEventPeer.php
new file mode 100644
index 000000000..3e6459f28
--- /dev/null
+++ b/workflow/engine/classes/model/EmailEventPeer.php
@@ -0,0 +1,23 @@
+<?php
+
+  // include base peer class
+  require_once 'classes/model/om/BaseEmailEventPeer.php';
+
+  // include object class
+  include_once 'classes/model/EmailEvent.php';
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'EMAIL_EVENT' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class EmailEventPeer extends BaseEmailEventPeer {
+
+} // EmailEventPeer
diff --git a/workflow/engine/classes/model/map/EmailEventMapBuilder.php b/workflow/engine/classes/model/map/EmailEventMapBuilder.php
new file mode 100644
index 000000000..e5d1d441a
--- /dev/null
+++ b/workflow/engine/classes/model/map/EmailEventMapBuilder.php
@@ -0,0 +1,84 @@
+<?php
+
+require_once 'propel/map/MapBuilder.php';
+include_once 'creole/CreoleTypes.php';
+
+
+/**
+ * This class adds structure of 'EMAIL_EVENT' table to 'workflow' DatabaseMap object.
+ *
+ *
+ *
+ * These statically-built map classes are used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    workflow.classes.model.map
+ */
+class EmailEventMapBuilder
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'classes.model.map.EmailEventMapBuilder';
+
+    /**
+     * The database map.
+     */
+    private $dbMap;
+
+    /**
+     * Tells us if this DatabaseMapBuilder is built so that we
+     * don't have to re-build it every time.
+     *
+     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
+     */
+    public function isBuilt()
+    {
+        return ($this->dbMap !== null);
+    }
+
+    /**
+     * Gets the databasemap this map builder built.
+     *
+     * @return     the databasemap
+     */
+    public function getDatabaseMap()
+    {
+        return $this->dbMap;
+    }
+
+    /**
+     * The doBuild() method builds the DatabaseMap
+     *
+     * @return     void
+     * @throws     PropelException
+     */
+    public function doBuild()
+    {
+        $this->dbMap = Propel::getDatabaseMap('workflow');
+
+        $tMap = $this->dbMap->addTable('EMAIL_EVENT');
+        $tMap->setPhpName('EmailEvent');
+
+        $tMap->setUseIdGenerator(false);
+
+        $tMap->addPrimaryKey('EMAIL_EVENT_UID', 'EmailEventUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('ACT_UID', 'ActUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('EMAIL_EVENT_FROM', 'EmailEventFrom', 'string', CreoleTypes::VARCHAR, true, 100);
+
+        $tMap->addColumn('EMAIL_EVENT_TO', 'EmailEventTo', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+        $tMap->addColumn('EMAIL_EVENT_SUBJECT', 'EmailEventSubject', 'string', CreoleTypes::VARCHAR, false, 150);
+
+        $tMap->addColumn('EMAIL_EVENT_BODY', 'EmailEventBody', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+    } // doBuild()
+
+} // EmailEventMapBuilder
diff --git a/workflow/engine/classes/model/om/BaseEmailEvent.php b/workflow/engine/classes/model/om/BaseEmailEvent.php
new file mode 100644
index 000000000..85a47a8e4
--- /dev/null
+++ b/workflow/engine/classes/model/om/BaseEmailEvent.php
@@ -0,0 +1,858 @@
+<?php
+
+require_once 'propel/om/BaseObject.php';
+
+require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'classes/model/EmailEventPeer.php';
+
+/**
+ * Base class that represents a row from the 'EMAIL_EVENT' table.
+ *
+ * 
+ *
+ * @package    workflow.classes.model.om
+ */
+abstract class BaseEmailEvent extends BaseObject implements Persistent
+{
+
+    /**
+     * The Peer class.
+     * Instance provides a convenient way of calling static methods on a class
+     * that calling code may not be able to identify.
+     * @var        EmailEventPeer
+    */
+    protected static $peer;
+
+    /**
+     * The value for the email_event_uid field.
+     * @var        string
+     */
+    protected $email_event_uid;
+
+    /**
+     * The value for the pro_uid field.
+     * @var        string
+     */
+    protected $pro_uid = '';
+
+    /**
+     * The value for the act_uid field.
+     * @var        string
+     */
+    protected $act_uid;
+
+    /**
+     * The value for the email_event_from field.
+     * @var        string
+     */
+    protected $email_event_from = '';
+
+    /**
+     * The value for the email_event_to field.
+     * @var        string
+     */
+    protected $email_event_to;
+
+    /**
+     * The value for the email_event_subject field.
+     * @var        string
+     */
+    protected $email_event_subject = '';
+
+    /**
+     * The value for the email_event_body field.
+     * @var        string
+     */
+    protected $email_event_body;
+
+    /**
+     * Flag to prevent endless save loop, if this object is referenced
+     * by another object which falls in this transaction.
+     * @var        boolean
+     */
+    protected $alreadyInSave = false;
+
+    /**
+     * Flag to prevent endless validation loop, if this object is referenced
+     * by another object which falls in this transaction.
+     * @var        boolean
+     */
+    protected $alreadyInValidation = false;
+
+    /**
+     * Get the [email_event_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getEmailEventUid()
+    {
+
+        return $this->email_event_uid;
+    }
+
+    /**
+     * Get the [pro_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getProUid()
+    {
+
+        return $this->pro_uid;
+    }
+
+    /**
+     * Get the [act_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getActUid()
+    {
+
+        return $this->act_uid;
+    }
+
+    /**
+     * Get the [email_event_from] column value.
+     * 
+     * @return     string
+     */
+    public function getEmailEventFrom()
+    {
+
+        return $this->email_event_from;
+    }
+
+    /**
+     * Get the [email_event_to] column value.
+     * 
+     * @return     string
+     */
+    public function getEmailEventTo()
+    {
+
+        return $this->email_event_to;
+    }
+
+    /**
+     * Get the [email_event_subject] column value.
+     * 
+     * @return     string
+     */
+    public function getEmailEventSubject()
+    {
+
+        return $this->email_event_subject;
+    }
+
+    /**
+     * Get the [email_event_body] column value.
+     * 
+     * @return     string
+     */
+    public function getEmailEventBody()
+    {
+
+        return $this->email_event_body;
+    }
+
+    /**
+     * Set the value of [email_event_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setEmailEventUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->email_event_uid !== $v) {
+            $this->email_event_uid = $v;
+            $this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_UID;
+        }
+
+    } // setEmailEventUid()
+
+    /**
+     * Set the value of [pro_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setProUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->pro_uid !== $v || $v === '') {
+            $this->pro_uid = $v;
+            $this->modifiedColumns[] = EmailEventPeer::PRO_UID;
+        }
+
+    } // setProUid()
+
+    /**
+     * Set the value of [act_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setActUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->act_uid !== $v) {
+            $this->act_uid = $v;
+            $this->modifiedColumns[] = EmailEventPeer::ACT_UID;
+        }
+
+    } // setActUid()
+
+    /**
+     * Set the value of [email_event_from] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setEmailEventFrom($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->email_event_from !== $v || $v === '') {
+            $this->email_event_from = $v;
+            $this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_FROM;
+        }
+
+    } // setEmailEventFrom()
+
+    /**
+     * Set the value of [email_event_to] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setEmailEventTo($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->email_event_to !== $v) {
+            $this->email_event_to = $v;
+            $this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_TO;
+        }
+
+    } // setEmailEventTo()
+
+    /**
+     * Set the value of [email_event_subject] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setEmailEventSubject($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->email_event_subject !== $v || $v === '') {
+            $this->email_event_subject = $v;
+            $this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_SUBJECT;
+        }
+
+    } // setEmailEventSubject()
+
+    /**
+     * Set the value of [email_event_body] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setEmailEventBody($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->email_event_body !== $v) {
+            $this->email_event_body = $v;
+            $this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_BODY;
+        }
+
+    } // setEmailEventBody()
+
+    /**
+     * Hydrates (populates) the object variables with values from the database resultset.
+     *
+     * An offset (1-based "start column") is specified so that objects can be hydrated
+     * with a subset of the columns in the resultset rows.  This is needed, for example,
+     * for results of JOIN queries where the resultset row includes columns from two or
+     * more tables.
+     *
+     * @param      ResultSet $rs The ResultSet class with cursor advanced to desired record pos.
+     * @param      int $startcol 1-based offset column which indicates which restultset column to start with.
+     * @return     int next starting column
+     * @throws     PropelException  - Any caught Exception will be rewrapped as a PropelException.
+     */
+    public function hydrate(ResultSet $rs, $startcol = 1)
+    {
+        try {
+
+            $this->email_event_uid = $rs->getString($startcol + 0);
+
+            $this->pro_uid = $rs->getString($startcol + 1);
+
+            $this->act_uid = $rs->getString($startcol + 2);
+
+            $this->email_event_from = $rs->getString($startcol + 3);
+
+            $this->email_event_to = $rs->getString($startcol + 4);
+
+            $this->email_event_subject = $rs->getString($startcol + 5);
+
+            $this->email_event_body = $rs->getString($startcol + 6);
+
+            $this->resetModified();
+
+            $this->setNew(false);
+
+            // FIXME - using NUM_COLUMNS may be clearer.
+            return $startcol + 7; // 7 = EmailEventPeer::NUM_COLUMNS - EmailEventPeer::NUM_LAZY_LOAD_COLUMNS).
+
+        } catch (Exception $e) {
+            throw new PropelException("Error populating EmailEvent object", $e);
+        }
+    }
+
+    /**
+     * Removes this object from datastore and sets delete attribute.
+     *
+     * @param      Connection $con
+     * @return     void
+     * @throws     PropelException
+     * @see        BaseObject::setDeleted()
+     * @see        BaseObject::isDeleted()
+     */
+    public function delete($con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("This object has already been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getConnection(EmailEventPeer::DATABASE_NAME);
+        }
+
+        try {
+            $con->begin();
+            EmailEventPeer::doDelete($this, $con);
+            $this->setDeleted(true);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Stores the object in the database.  If the object is new,
+     * it inserts it; otherwise an update is performed.  This method
+     * wraps the doSave() worker method in a transaction.
+     *
+     * @param      Connection $con
+     * @return     int The number of rows affected by this insert/update
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    public function save($con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("You cannot save an object that has been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getConnection(EmailEventPeer::DATABASE_NAME);
+        }
+
+        try {
+            $con->begin();
+            $affectedRows = $this->doSave($con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Stores the object in the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All related objects are also updated in this method.
+     *
+     * @param      Connection $con
+     * @return     int The number of rows affected by this insert/update and any referring
+     * @throws     PropelException
+     * @see        save()
+     */
+    protected function doSave($con)
+    {
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        if (!$this->alreadyInSave) {
+            $this->alreadyInSave = true;
+
+
+            // If this object has been modified, then save it to the database.
+            if ($this->isModified()) {
+                if ($this->isNew()) {
+                    $pk = EmailEventPeer::doInsert($this, $con);
+                    $affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
+                                         // should always be true here (even though technically
+                                         // BasePeer::doInsert() can insert multiple rows).
+
+                    $this->setNew(false);
+                } else {
+                    $affectedRows += EmailEventPeer::doUpdate($this, $con);
+                }
+                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+            }
+
+            $this->alreadyInSave = false;
+        }
+        return $affectedRows;
+    } // doSave()
+
+    /**
+     * Array of ValidationFailed objects.
+     * @var        array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return     array ValidationFailed[]
+     * @see        validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
+     * Validates the objects modified field values and all objects related to this table.
+     *
+     * If $columns is either a column name or an array of column names
+     * only those columns are validated.
+     *
+     * @param      mixed $columns Column name or an array of column names.
+     * @return     boolean Whether all columns pass validation.
+     * @see        doValidate()
+     * @see        getValidationFailures()
+     */
+    public function validate($columns = null)
+    {
+        $res = $this->doValidate($columns);
+        if ($res === true) {
+            $this->validationFailures = array();
+            return true;
+        } else {
+            $this->validationFailures = $res;
+            return false;
+        }
+    }
+
+    /**
+     * This function performs the validation work for complex object models.
+     *
+     * In addition to checking the current object, all related objects will
+     * also be validated.  If all pass then <code>true</code> is returned; otherwise
+     * an aggreagated array of ValidationFailed objects will be returned.
+     *
+     * @param      array $columns Array of column names to validate.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
+     */
+    protected function doValidate($columns = null)
+    {
+        if (!$this->alreadyInValidation) {
+            $this->alreadyInValidation = true;
+            $retval = null;
+
+            $failureMap = array();
+
+
+            if (($retval = EmailEventPeer::doValidate($this, $columns)) !== true) {
+                $failureMap = array_merge($failureMap, $retval);
+            }
+
+
+
+            $this->alreadyInValidation = false;
+        }
+
+        return (!empty($failureMap) ? $failureMap : true);
+    }
+
+    /**
+     * Retrieves a field from the object by name passed in as a string.
+     *
+     * @param      string $name name
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TYPE_PHPNAME,
+     *                     TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     mixed Value of field.
+     */
+    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
+    {
+        $pos = EmailEventPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
+        return $this->getByPosition($pos);
+    }
+
+    /**
+     * Retrieves a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @return     mixed Value of field at $pos
+     */
+    public function getByPosition($pos)
+    {
+        switch($pos) {
+            case 0:
+                return $this->getEmailEventUid();
+                break;
+            case 1:
+                return $this->getProUid();
+                break;
+            case 2:
+                return $this->getActUid();
+                break;
+            case 3:
+                return $this->getEmailEventFrom();
+                break;
+            case 4:
+                return $this->getEmailEventTo();
+                break;
+            case 5:
+                return $this->getEmailEventSubject();
+                break;
+            case 6:
+                return $this->getEmailEventBody();
+                break;
+            default:
+                return null;
+                break;
+        } // switch()
+    }
+
+    /**
+     * Exports the object as an array.
+     *
+     * You can specify the key type of the array by passing one of the class
+     * type constants.
+     *
+     * @param      string $keyType One of the class type constants TYPE_PHPNAME,
+     *                        TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     an associative array containing the field names (as keys) and field values
+     */
+    public function toArray($keyType = BasePeer::TYPE_PHPNAME)
+    {
+        $keys = EmailEventPeer::getFieldNames($keyType);
+        $result = array(
+            $keys[0] => $this->getEmailEventUid(),
+            $keys[1] => $this->getProUid(),
+            $keys[2] => $this->getActUid(),
+            $keys[3] => $this->getEmailEventFrom(),
+            $keys[4] => $this->getEmailEventTo(),
+            $keys[5] => $this->getEmailEventSubject(),
+            $keys[6] => $this->getEmailEventBody(),
+        );
+        return $result;
+    }
+
+    /**
+     * Sets a field from the object by name passed in as a string.
+     *
+     * @param      string $name peer name
+     * @param      mixed $value field value
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TYPE_PHPNAME,
+     *                     TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     void
+     */
+    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
+    {
+        $pos = EmailEventPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
+        return $this->setByPosition($pos, $value);
+    }
+
+    /**
+     * Sets a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @param      mixed $value field value
+     * @return     void
+     */
+    public function setByPosition($pos, $value)
+    {
+        switch($pos) {
+            case 0:
+                $this->setEmailEventUid($value);
+                break;
+            case 1:
+                $this->setProUid($value);
+                break;
+            case 2:
+                $this->setActUid($value);
+                break;
+            case 3:
+                $this->setEmailEventFrom($value);
+                break;
+            case 4:
+                $this->setEmailEventTo($value);
+                break;
+            case 5:
+                $this->setEmailEventSubject($value);
+                break;
+            case 6:
+                $this->setEmailEventBody($value);
+                break;
+        } // switch()
+    }
+
+    /**
+     * Populates the object using an array.
+     *
+     * This is particularly useful when populating an object from one of the
+     * request arrays (e.g. $_POST).  This method goes through the column
+     * names, checking to see whether a matching key exists in populated
+     * array. If so the setByName() method is called for that column.
+     *
+     * You can specify the key type of the array by additionally passing one
+     * of the class type constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME,
+     * TYPE_NUM. The default key type is the column's phpname (e.g. 'authorId')
+     *
+     * @param      array  $arr     An array to populate the object from.
+     * @param      string $keyType The type of keys the array uses.
+     * @return     void
+     */
+    public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME)
+    {
+        $keys = EmailEventPeer::getFieldNames($keyType);
+
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setEmailEventUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setProUid($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setActUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setEmailEventFrom($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setEmailEventTo($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setEmailEventSubject($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setEmailEventBody($arr[$keys[6]]);
+        }
+
+    }
+
+    /**
+     * Build a Criteria object containing the values of all modified columns in this object.
+     *
+     * @return     Criteria The Criteria object containing all modified values.
+     */
+    public function buildCriteria()
+    {
+        $criteria = new Criteria(EmailEventPeer::DATABASE_NAME);
+
+        if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_UID)) {
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_UID, $this->email_event_uid);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::PRO_UID)) {
+            $criteria->add(EmailEventPeer::PRO_UID, $this->pro_uid);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::ACT_UID)) {
+            $criteria->add(EmailEventPeer::ACT_UID, $this->act_uid);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_FROM)) {
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_FROM, $this->email_event_from);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_TO)) {
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_TO, $this->email_event_to);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_SUBJECT)) {
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_SUBJECT, $this->email_event_subject);
+        }
+
+        if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_BODY)) {
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_BODY, $this->email_event_body);
+        }
+
+
+        return $criteria;
+    }
+
+    /**
+     * Builds a Criteria object containing the primary key for this object.
+     *
+     * Unlike buildCriteria() this method includes the primary key values regardless
+     * of whether or not they have been modified.
+     *
+     * @return     Criteria The Criteria object containing value(s) for primary key(s).
+     */
+    public function buildPkeyCriteria()
+    {
+        $criteria = new Criteria(EmailEventPeer::DATABASE_NAME);
+
+        $criteria->add(EmailEventPeer::EMAIL_EVENT_UID, $this->email_event_uid);
+
+        return $criteria;
+    }
+
+    /**
+     * Returns the primary key for this object (row).
+     * @return     string
+     */
+    public function getPrimaryKey()
+    {
+        return $this->getEmailEventUid();
+    }
+
+    /**
+     * Generic method to set the primary key (email_event_uid column).
+     *
+     * @param      string $key Primary key.
+     * @return     void
+     */
+    public function setPrimaryKey($key)
+    {
+        $this->setEmailEventUid($key);
+    }
+
+    /**
+     * Sets contents of passed object to values from current object.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      object $copyObj An object of EmailEvent (or compatible) type.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @throws     PropelException
+     */
+    public function copyInto($copyObj, $deepCopy = false)
+    {
+
+        $copyObj->setProUid($this->pro_uid);
+
+        $copyObj->setActUid($this->act_uid);
+
+        $copyObj->setEmailEventFrom($this->email_event_from);
+
+        $copyObj->setEmailEventTo($this->email_event_to);
+
+        $copyObj->setEmailEventSubject($this->email_event_subject);
+
+        $copyObj->setEmailEventBody($this->email_event_body);
+
+
+        $copyObj->setNew(true);
+
+        $copyObj->setEmailEventUid(NULL); // this is a pkey column, so set to default value
+
+    }
+
+    /**
+     * Makes a copy of this object that will be inserted as a new row in table when saved.
+     * It creates a new object filling in the simple attributes, but skipping any primary
+     * keys that are defined for the table.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @return     EmailEvent Clone of current object.
+     * @throws     PropelException
+     */
+    public function copy($deepCopy = false)
+    {
+        // we use get_class(), because this might be a subclass
+        $clazz = get_class($this);
+        $copyObj = new $clazz();
+        $this->copyInto($copyObj, $deepCopy);
+        return $copyObj;
+    }
+
+    /**
+     * Returns a peer instance associated with this om.
+     *
+     * Since Peer classes are not to have any instance attributes, this method returns the
+     * same instance for all member of this class. The method could therefore
+     * be static, but this would prevent one from overriding the behavior.
+     *
+     * @return     EmailEventPeer
+     */
+    public function getPeer()
+    {
+        if (self::$peer === null) {
+            self::$peer = new EmailEventPeer();
+        }
+        return self::$peer;
+    }
+}
+
diff --git a/workflow/engine/classes/model/om/BaseEmailEventPeer.php b/workflow/engine/classes/model/om/BaseEmailEventPeer.php
new file mode 100644
index 000000000..f61011a88
--- /dev/null
+++ b/workflow/engine/classes/model/om/BaseEmailEventPeer.php
@@ -0,0 +1,597 @@
+<?php
+
+require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by EmailEventPeer::getOMClass()
+include_once 'classes/model/EmailEvent.php';
+
+/**
+ * Base static class for performing query and update operations on the 'EMAIL_EVENT' table.
+ *
+ * 
+ *
+ * @package    workflow.classes.model.om
+ */
+abstract class BaseEmailEventPeer
+{
+
+    /** the default database name for this class */
+    const DATABASE_NAME = 'workflow';
+
+    /** the table name for this class */
+    const TABLE_NAME = 'EMAIL_EVENT';
+
+    /** A class that can be returned by this peer. */
+    const CLASS_DEFAULT = 'classes.model.EmailEvent';
+
+    /** The total number of columns. */
+    const NUM_COLUMNS = 7;
+
+    /** The number of lazy-loaded columns. */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+
+    /** the column name for the EMAIL_EVENT_UID field */
+    const EMAIL_EVENT_UID = 'EMAIL_EVENT.EMAIL_EVENT_UID';
+
+    /** the column name for the PRO_UID field */
+    const PRO_UID = 'EMAIL_EVENT.PRO_UID';
+
+    /** the column name for the ACT_UID field */
+    const ACT_UID = 'EMAIL_EVENT.ACT_UID';
+
+    /** the column name for the EMAIL_EVENT_FROM field */
+    const EMAIL_EVENT_FROM = 'EMAIL_EVENT.EMAIL_EVENT_FROM';
+
+    /** the column name for the EMAIL_EVENT_TO field */
+    const EMAIL_EVENT_TO = 'EMAIL_EVENT.EMAIL_EVENT_TO';
+
+    /** the column name for the EMAIL_EVENT_SUBJECT field */
+    const EMAIL_EVENT_SUBJECT = 'EMAIL_EVENT.EMAIL_EVENT_SUBJECT';
+
+    /** the column name for the EMAIL_EVENT_BODY field */
+    const EMAIL_EVENT_BODY = 'EMAIL_EVENT.EMAIL_EVENT_BODY';
+
+    /** The PHP to DB Name Mapping */
+    private static $phpNameMap = null;
+
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    private static $fieldNames = array (
+        BasePeer::TYPE_PHPNAME => array ('EmailEventUid', 'ProUid', 'ActUid', 'EmailEventFrom', 'EmailEventTo', 'EmailEventSubject', 'EmailEventBody', ),
+        BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID, EmailEventPeer::PRO_UID, EmailEventPeer::ACT_UID, EmailEventPeer::EMAIL_EVENT_FROM, EmailEventPeer::EMAIL_EVENT_TO, EmailEventPeer::EMAIL_EVENT_SUBJECT, EmailEventPeer::EMAIL_EVENT_BODY, ),
+        BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID', 'PRO_UID', 'ACT_UID', 'EMAIL_EVENT_FROM', 'EMAIL_EVENT_TO', 'EMAIL_EVENT_SUBJECT', 'EMAIL_EVENT_BODY', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
+     */
+    private static $fieldKeys = array (
+        BasePeer::TYPE_PHPNAME => array ('EmailEventUid' => 0, 'ProUid' => 1, 'ActUid' => 2, 'EmailEventFrom' => 3, 'EmailEventTo' => 4, 'EmailEventSubject' => 5, 'EmailEventBody' => 6, ),
+        BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID => 0, EmailEventPeer::PRO_UID => 1, EmailEventPeer::ACT_UID => 2, EmailEventPeer::EMAIL_EVENT_FROM => 3, EmailEventPeer::EMAIL_EVENT_TO => 4, EmailEventPeer::EMAIL_EVENT_SUBJECT => 5, EmailEventPeer::EMAIL_EVENT_BODY => 6, ),
+        BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID' => 0, 'PRO_UID' => 1, 'ACT_UID' => 2, 'EMAIL_EVENT_FROM' => 3, 'EMAIL_EVENT_TO' => 4, 'EMAIL_EVENT_SUBJECT' => 5, 'EMAIL_EVENT_BODY' => 6, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+    );
+
+    /**
+     * @return     MapBuilder the map builder for this peer
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function getMapBuilder()
+    {
+        include_once 'classes/model/map/EmailEventMapBuilder.php';
+        return BasePeer::getMapBuilder('classes.model.map.EmailEventMapBuilder');
+    }
+    /**
+     * Gets a map (hash) of PHP names to DB column names.
+     *
+     * @return     array The PHP to DB name map for this peer
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     * @deprecated Use the getFieldNames() and translateFieldName() methods instead of this.
+     */
+    public static function getPhpNameMap()
+    {
+        if (self::$phpNameMap === null) {
+            $map = EmailEventPeer::getTableMap();
+            $columns = $map->getColumns();
+            $nameMap = array();
+            foreach ($columns as $column) {
+                $nameMap[$column->getPhpName()] = $column->getColumnName();
+            }
+            self::$phpNameMap = $nameMap;
+        }
+        return self::$phpNameMap;
+    }
+    /**
+     * Translates a fieldname to another type
+     *
+     * @param      string $name field name
+     * @param      string $fromType One of the class type constants TYPE_PHPNAME,
+     *                         TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @param      string $toType   One of the class type constants
+     * @return     string translated name of the field.
+     */
+    static public function translateFieldName($name, $fromType, $toType)
+    {
+        $toNames = self::getFieldNames($toType);
+        $key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null;
+        if ($key === null) {
+            throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true));
+        }
+        return $toNames[$key];
+    }
+
+    /**
+     * Returns an array of of field names.
+     *
+     * @param      string $type The type of fieldnames to return:
+     *                      One of the class type constants TYPE_PHPNAME,
+     *                      TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     array A list of field names
+     */
+
+    static public function getFieldNames($type = BasePeer::TYPE_PHPNAME)
+    {
+        if (!array_key_exists($type, self::$fieldNames)) {
+            throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM. ' . $type . ' was given.');
+        }
+        return self::$fieldNames[$type];
+    }
+
+    /**
+     * Convenience method which changes table.column to alias.column.
+     *
+     * Using this method you can maintain SQL abstraction while using column aliases.
+     * <code>
+     *      $c->addAlias("alias1", TablePeer::TABLE_NAME);
+     *      $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
+     * </code>
+     * @param      string $alias The alias for the current table.
+     * @param      string $column The column name for current table. (i.e. EmailEventPeer::COLUMN_NAME).
+     * @return     string
+     */
+    public static function alias($alias, $column)
+    {
+        return str_replace(EmailEventPeer::TABLE_NAME.'.', $alias.'.', $column);
+    }
+
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param      criteria object containing the columns to add.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria)
+    {
+
+        $criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_UID);
+
+        $criteria->addSelectColumn(EmailEventPeer::PRO_UID);
+
+        $criteria->addSelectColumn(EmailEventPeer::ACT_UID);
+
+        $criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_FROM);
+
+        $criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_TO);
+
+        $criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_SUBJECT);
+
+        $criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_BODY);
+
+    }
+
+    const COUNT = 'COUNT(EMAIL_EVENT.EMAIL_EVENT_UID)';
+    const COUNT_DISTINCT = 'COUNT(DISTINCT EMAIL_EVENT.EMAIL_EVENT_UID)';
+
+    /**
+     * Returns the number of rows matching criteria.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria).
+     * @param      Connection $con
+     * @return     int Number of matching rows.
+     */
+    public static function doCount(Criteria $criteria, $distinct = false, $con = null)
+    {
+        // we're going to modify criteria, so copy it first
+        $criteria = clone $criteria;
+
+        // clear out anything that might confuse the ORDER BY clause
+        $criteria->clearSelectColumns()->clearOrderByColumns();
+        if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+            $criteria->addSelectColumn(EmailEventPeer::COUNT_DISTINCT);
+        } else {
+            $criteria->addSelectColumn(EmailEventPeer::COUNT);
+        }
+
+        // just in case we're grouping: add those columns to the select statement
+        foreach ($criteria->getGroupByColumns() as $column) {
+            $criteria->addSelectColumn($column);
+        }
+
+        $rs = EmailEventPeer::doSelectRS($criteria, $con);
+        if ($rs->next()) {
+            return $rs->getInt(1);
+        } else {
+            // no rows returned; we infer that means 0 matches.
+            return 0;
+        }
+    }
+    /**
+     * Method to select one object from the DB.
+     *
+     * @param      Criteria $criteria object used to create the SELECT statement.
+     * @param      Connection $con
+     * @return     EmailEvent
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doSelectOne(Criteria $criteria, $con = null)
+    {
+        $critcopy = clone $criteria;
+        $critcopy->setLimit(1);
+        $objects = EmailEventPeer::doSelect($critcopy, $con);
+        if ($objects) {
+            return $objects[0];
+        }
+        return null;
+    }
+    /**
+     * Method to do selects.
+     *
+     * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+     * @param      Connection $con
+     * @return     array Array of selected Objects
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doSelect(Criteria $criteria, $con = null)
+    {
+        return EmailEventPeer::populateObjects(EmailEventPeer::doSelectRS($criteria, $con));
+    }
+    /**
+     * Prepares the Criteria object and uses the parent doSelect()
+     * method to get a ResultSet.
+     *
+     * Use this method directly if you want to just get the resultset
+     * (instead of an array of objects).
+     *
+     * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+     * @param      Connection $con the connection to use
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     * @return     ResultSet The resultset object with numerically-indexed fields.
+     * @see        BasePeer::doSelect()
+     */
+    public static function doSelectRS(Criteria $criteria, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        if (!$criteria->getSelectColumns()) {
+            $criteria = clone $criteria;
+            EmailEventPeer::addSelectColumns($criteria);
+        }
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        // BasePeer returns a Creole ResultSet, set to return
+        // rows indexed numerically.
+        return BasePeer::doSelect($criteria, $con);
+    }
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(ResultSet $rs)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = EmailEventPeer::getOMClass();
+        $cls = Propel::import($cls);
+        // populate the object(s)
+        while ($rs->next()) {
+
+            $obj = new $cls();
+            $obj->hydrate($rs);
+            $results[] = $obj;
+
+        }
+        return $results;
+    }
+    /**
+     * Returns the TableMap related to this peer.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return     TableMap
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
+    }
+
+    /**
+     * The class that the Peer will make instances of.
+     *
+     * This uses a dot-path notation which is tranalted into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @return     string path.to.ClassName
+     */
+    public static function getOMClass()
+    {
+        return EmailEventPeer::CLASS_DEFAULT;
+    }
+
+    /**
+     * Method perform an INSERT on the database, given a EmailEvent or Criteria object.
+     *
+     * @param      mixed $values Criteria or EmailEvent object containing data that is used to create the INSERT statement.
+     * @param      Connection $con the connection to use
+     * @return     mixed The new primary key.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+        } else {
+            $criteria = $values->buildCriteria(); // build Criteria from EmailEvent object
+        }
+
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->begin();
+            $pk = BasePeer::doInsert($criteria, $con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+    /**
+     * Method perform an UPDATE on the database, given a EmailEvent or Criteria object.
+     *
+     * @param      mixed $values Criteria or EmailEvent object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
+     * @return     int The number of affected rows (if supported by underlying database driver).
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doUpdate($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $selectCriteria = new Criteria(self::DATABASE_NAME);
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+
+            $comparison = $criteria->getComparison(EmailEventPeer::EMAIL_EVENT_UID);
+            $selectCriteria->add(EmailEventPeer::EMAIL_EVENT_UID, $criteria->remove(EmailEventPeer::EMAIL_EVENT_UID), $comparison);
+
+        } else {
+            $criteria = $values->buildCriteria(); // gets full criteria
+            $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
+        }
+
+        // set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        return BasePeer::doUpdate($selectCriteria, $criteria, $con);
+    }
+
+    /**
+     * Method to DELETE all rows from the EMAIL_EVENT table.
+     *
+     * @return     int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll($con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->begin();
+            $affectedRows += BasePeer::doDeleteAll(EmailEventPeer::TABLE_NAME, $con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Method perform a DELETE on the database, given a EmailEvent or Criteria object OR a primary key value.
+     *
+     * @param      mixed $values Criteria or EmailEvent object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param      Connection $con the connection to use
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
+     *              if supported by native driver or if emulated using Propel.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+    */
+    public static function doDelete($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(EmailEventPeer::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+        } elseif ($values instanceof EmailEvent) {
+
+            $criteria = $values->buildPkeyCriteria();
+        } else {
+            // it must be the primary key
+            $criteria = new Criteria(self::DATABASE_NAME);
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_UID, (array) $values, Criteria::IN);
+        }
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->begin();
+
+            $affectedRows += BasePeer::doDelete($criteria, $con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Validates all modified columns of given EmailEvent object.
+     * If parameter $columns is either a single column name or an array of column names
+     * than only those columns are validated.
+     *
+     * NOTICE: This does not apply to primary or foreign keys for now.
+     *
+     * @param      EmailEvent $obj The object to validate.
+     * @param      mixed $cols Column name or array of column names.
+     *
+     * @return     mixed TRUE if all columns are valid or the error message of the first invalid column.
+     */
+    public static function doValidate(EmailEvent $obj, $cols = null)
+    {
+        $columns = array();
+
+        if ($cols) {
+            $dbMap = Propel::getDatabaseMap(EmailEventPeer::DATABASE_NAME);
+            $tableMap = $dbMap->getTable(EmailEventPeer::TABLE_NAME);
+
+            if (! is_array($cols)) {
+                $cols = array($cols);
+            }
+
+            foreach ($cols as $colName) {
+                if ($tableMap->containsColumn($colName)) {
+                    $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
+                    $columns[$colName] = $obj->$get();
+                }
+            }
+        } else {
+
+        }
+
+        return BasePeer::doValidate(EmailEventPeer::DATABASE_NAME, EmailEventPeer::TABLE_NAME, $columns);
+    }
+
+    /**
+     * Retrieve a single object by pkey.
+     *
+     * @param      mixed $pk the primary key.
+     * @param      Connection $con the connection to use
+     * @return     EmailEvent
+     */
+    public static function retrieveByPK($pk, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $criteria = new Criteria(EmailEventPeer::DATABASE_NAME);
+
+        $criteria->add(EmailEventPeer::EMAIL_EVENT_UID, $pk);
+
+
+        $v = EmailEventPeer::doSelect($criteria, $con);
+
+        return !empty($v) > 0 ? $v[0] : null;
+    }
+
+    /**
+     * Retrieve multiple objects by pkey.
+     *
+     * @param      array $pks List of primary keys
+     * @param      Connection $con the connection to use
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function retrieveByPKs($pks, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $objs = null;
+        if (empty($pks)) {
+            $objs = array();
+        } else {
+            $criteria = new Criteria();
+            $criteria->add(EmailEventPeer::EMAIL_EVENT_UID, $pks, Criteria::IN);
+            $objs = EmailEventPeer::doSelect($criteria, $con);
+        }
+        return $objs;
+    }
+}
+
+
+// static code to register the map builder for this Peer with the main Propel class
+if (Propel::isInit()) {
+    // the MapBuilder classes register themselves with Propel during initialization
+    // so we need to load them here.
+    try {
+        BaseEmailEventPeer::getMapBuilder();
+    } catch (Exception $e) {
+        Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR);
+    }
+} else {
+    // even if Propel is not yet initialized, the map builder class can be registered
+    // now and then it will be loaded when Propel initializes.
+    require_once 'classes/model/map/EmailEventMapBuilder.php';
+    Propel::registerMapBuilder('classes.model.map.EmailEventMapBuilder');
+}
+
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 21ee5cd01..958310c48 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -5048,5 +5048,27 @@
             </vendor>
         </index>
     </table>
+    
+    <table name="EMAIL_EVENT">
+        <vendor type="mysql">
+            <parameter name="Name" value="EMAIL_EVENT" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+        </vendor>
+        <column name="EMAIL_EVENT_UID" type="VARCHAR" size="32" required="true" primaryKey="true" />
+        <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
+        <column name="ACT_UID" type="VARCHAR" size="32" required="true" />
+        <column name="EMAIL_EVENT_FROM" type="VARCHAR" size="100" required="true" default="" />
+        <column name="EMAIL_EVENT_TO" type="LONGVARCHAR" required="true" />
+        <column name="EMAIL_EVENT_SUBJECT" type="VARCHAR" size="150" required="false" default=""/>
+        <column name="EMAIL_EVENT_BODY" type="LONGVARCHAR" required="true" />
+    </table>
 </database>
 
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index a8e5d3c0f..d922106a6 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -2825,3 +2825,22 @@ CREATE TABLE `CATALOG`
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;
 
+#-----------------------------------------------------------------------------
+#-- EMAIL_EVENT
+#-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `EMAIL_EVENT`;
+
+
+CREATE TABLE `EMAIL_EVENT`
+(
+	`EMAIL_EVENT_UID` VARCHAR(32)  NOT NULL,
+	`PRO_UID` VARCHAR(32) default '' NOT NULL,
+	`ACT_UID` VARCHAR(32)  NOT NULL,
+	`EMAIL_EVENT_FROM` VARCHAR(100) default '' NOT NULL,
+	`EMAIL_EVENT_TO` MEDIUMTEXT  NOT NULL,
+	`EMAIL_EVENT_SUBJECT` VARCHAR(150) default '' NOT NULL,
+	`EMAIL_EVENT_BODY` MEDIUMTEXT  NOT NULL,
+	PRIMARY KEY (`EMAIL_EVENT_UID`)
+)ENGINE=InnoDB  DEFAULT CHARSET='utf8'; 
+
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
new file mode 100644
index 000000000..2e05f715e
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
@@ -0,0 +1,273 @@
+<?php
+namespace ProcessMaker\BusinessModel;
+
+class EmailEvent
+{
+    /*private $arrayFieldDefinition = array(
+        "EMAIL_EVENT_UID"         => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "emailEventUid"),
+        "PRJ_UID"           => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectUid"),
+        "ACT_UID"           => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(), "fieldNameAux" => "eventUid"),
+        "EMAIL_EVENT_FROM"          => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "messageTypeUid"),
+        "EMAIL_EVENT_TO"     => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "EmailEventUserUid"),
+        "EMAIL_EVENT_SUBJECT"   => array("type" => "array",  "required" => false, "empty" => true,  "defaultValues" => array(), "fieldNameAux" => "EmailEventVariables"),
+        "EMAIL_EVENT_BODY" => array("type" => "string", "required" => false, "empty" => true,  "defaultValues" => array(), "fieldNameAux" => "EmailEventCorrelation")
+    );
+    */
+    
+    /**
+     * Get the email accounts of the current workspace
+     *     
+     * return array
+     */
+    public function getEmailEventAccounts()
+    {
+        try {
+            $criteria = new \Criteria("workflow");
+            $criteria->clearSelectColumns();
+            $criteria->addSelectColumn(\UsersPeer::USR_UID);
+            $criteria->addSelectColumn(\UsersPeer::USR_EMAIL);
+            $criteria->add(\UsersPeer::USR_STATUS, "ACTIVE");
+            $result = \UsersPeer::doSelectRS($criteria);
+            $result->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $result->next();
+            $accountsArray = array();
+            while ($aRow = $result->getRow()) {
+                if (($aRow['USR_EMAIL'] != null) || ($aRow['USR_EMAIL'] != "")) {
+                    $accountsArray[] = array_change_key_case($aRow, CASE_LOWER);
+                } 
+                $result->next();
+            }
+            return $accountsArray;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    /**
+     * Get the Email-Event data
+     * @var string $act_uid. uid for activity  
+     * return array
+     */
+    public function getEmailEventData($act_uid)
+    {
+        try {
+            //Get data
+            $criteria = $this->getEmailEventCriteria();
+            $criteria->add(\EmailEventPeer::ACT_UID, $act_uid, \Criteria::EQUAL);
+            $rsCriteria = \EmailEventPeer::doSelectRS($criteria);
+            $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $rsCriteria->next();
+            $row = $rsCriteria->getRow();
+            if(is_array($row)) {
+                $row = array_change_key_case($row, CASE_LOWER);
+            }
+            return $row;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    /**
+     * Save Data for Email-Event
+     * @var string $prj_uid. Uid for Process
+     * @var string $arrayData. Data for Trigger
+     *     
+     * return array
+     */
+    public function save($prj_uid = '', $arrayData = array())
+    {
+        try {
+            //Verify data
+            $process = new \ProcessMaker\BusinessModel\Process();
+            $validator = new \ProcessMaker\BusinessModel\Validator();
+
+            $validator->throwExceptionIfDataIsNotArray($arrayData, "\$arrayData");
+            $validator->throwExceptionIfDataIsEmpty($arrayData, "\$arrayData");
+
+            //Set data
+            $arrayData = array_change_key_case($arrayData, CASE_UPPER);
+
+            //Verify data
+            $process->throwExceptionIfNotExistsProcess($prj_uid, "projectUid");
+
+            //Create
+            $db = \Propel::getConnection("workflow");
+
+            try {
+                $emailEvent = new \EmailEvent();
+                $emailEvent->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
+                
+                $emailEventUid = \ProcessMaker\Util\Common::generateUID();
+
+                $emailEvent->setEmailEventUid($emailEventUid);
+                $emailEvent->setProUid($prj_uid);
+
+                $db->begin();
+                $result = $emailEvent->save();
+                $db->commit();
+                
+                return $this->getEmailEvent($emailEventUid);
+            } catch (\Exception $e) {
+                $db->rollback();
+                throw $e;
+            }
+        } catch (\Exception $e) {
+            throw $e;
+        }    
+    }
+    
+    /**
+     * Update Email-Event
+     *
+     * @param string $emailEventUid Unique id of Email-Event
+     * @param array  $arrayData Data
+     *
+     * return array Return data of the Email-Event updated
+     */
+    public function update($emailEventUid, array $arrayData)
+    {
+        try {
+            //Verify data
+            $validator = new \ProcessMaker\BusinessModel\Validator();
+
+            $validator->throwExceptionIfDataIsNotArray($arrayData, "\$arrayData");
+            $validator->throwExceptionIfDataIsEmpty($arrayData, "\$arrayData");
+
+            //Set data
+            $arrayData = array_change_key_case($arrayData, CASE_UPPER);
+            $arrayDataBackup = $arrayData;
+
+            //Set variables
+            $arrayEmailEventData = $this->getEmailEvent($emailEventUid);
+
+            //Verify data
+            $this->verifyIfEmailEventExists($emailEventUid); 
+
+            //Update
+            $db = \Propel::getConnection("workflow");
+
+            try {
+                $emailEvent = \EmailEventPeer::retrieveByPK($emailEventUid);
+                $emailEvent->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
+         
+                $db->begin();
+                $result = $emailEvent->save();
+                $db->commit();
+
+                $arrayData = $arrayDataBackup;
+                $arrayData = array_change_key_case($arrayData, CASE_LOWER);
+                return $arrayData;
+                
+            } catch (\Exception $e) {
+                $cnn->rollback();
+
+                throw $e;
+            }
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    } 
+    
+    /**
+     * Delete Email-Event
+     *
+     * @param string $emailEventUid Unique id of Email-Event
+     *
+     * return void
+     */
+    public function delete($emailEventUid)
+    {
+        try {
+            //Verify data
+            $this->verifyIfEmailEventExists($emailEventUid);
+
+            //Delete
+            $criteria = new \Criteria("workflow");
+            $criteria->add(\EmailEventPeer::EMAIL_EVENT_UID, $emailEventUid, \Criteria::EQUAL);
+            $result = \EmailEventPeer::doDelete($criteria);
+            
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    /**
+     * Get data of a Email-Event
+     *
+     * @param string $emailEventUid Unique id of Email-Event
+     * @param bool   $flagGetRecord             Value that set the getting
+     *
+     * return array Return an array with data of a Email-Event
+     */
+    public function getEmailEvent($emailEventUid)
+    {
+        try {
+            //Verify data
+           $this->verifyIfEmailEventExists($emailEventUid);
+
+            //Get data
+            $criteria = $this->getEmailEventCriteria();
+            $criteria->add(\EmailEventPeer::EMAIL_EVENT_UID, $emailEventUid, \Criteria::EQUAL);
+            $rsCriteria = \EmailEventPeer::doSelectRS($criteria);
+            $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $rsCriteria->next();
+            $row = $rsCriteria->getRow();
+
+            //Return
+            return $row;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    /**
+     * Verify if exists the Email-Event
+     *
+     * @param string $emailEventUid Unique id of Email-Event
+     *
+     * return bool Return true if exists the Email-Event, false otherwise
+     */
+    public function exists($emailEventUid)
+    {
+        try {
+            $obj = \EmailEventPeer::retrieveByPK($emailEventUid);
+
+            return (!is_null($obj))? true : false;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    /**
+     * Get criteria for Email-Event
+     *
+     * return object
+     */
+    public function getEmailEventCriteria()
+    {
+        try {
+            $criteria = new \Criteria("workflow");
+
+            $criteria->addSelectColumn(\EmailEventPeer::EMAIL_EVENT_UID);
+            $criteria->addSelectColumn(\EmailEventPeer::PRO_UID);
+            $criteria->addSelectColumn(\EmailEventPeer::ACT_UID);
+            $criteria->addSelectColumn(\EmailEventPeer::EMAIL_EVENT_FROM);
+            $criteria->addSelectColumn(\EmailEventPeer::EMAIL_EVENT_TO);
+            $criteria->addSelectColumn(\EmailEventPeer::EMAIL_EVENT_SUBJECT);
+            $criteria->addSelectColumn(\EmailEventPeer::EMAIL_EVENT_BODY);
+
+            return $criteria;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+    
+    public function verifyIfEmailEventExists($emailEventUid)
+    {
+        if (!$this->exists($emailEventUid)) {
+            throw new \Exception(\G::LoadTranslation("ID_EMAIL_EVENT_DEFINITION_DOES_NOT_EXIST", array("Email Event Uid", $emailEventUid)));
+        }
+    }
+
+}
+
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/EmailEvent.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/EmailEvent.php
new file mode 100644
index 000000000..672d27824
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/EmailEvent.php
@@ -0,0 +1,108 @@
+<?php
+namespace ProcessMaker\Services\Api\Project;
+
+use \ProcessMaker\Services\Api;
+use \Luracast\Restler\RestException;
+
+/**
+ * Project\EmailEvent Api Controller
+ *
+ * @protected
+ */
+class EmailEvent extends Api
+{
+    private $EmailEvent;
+
+    /**
+     * Constructor of the class
+     *
+     * return void
+     */
+    public function __construct()
+    {
+        try {
+            $this->EmailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
+        } catch (\Exception $e) {
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+    }
+    
+    /**
+     * @url GET /:prj_uid/email-event/accounts
+     *
+     * @param string $prj_uid {@min 1} {@max 32}
+     */
+    public function doGetEmailEventAccounts($prj_uid)
+    {
+        try {
+            $response = $this->EmailEvent->GetEmailEventAccounts();
+            return $response;
+        } catch (\Exception $e) {
+            throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+        }
+    }
+    
+    /**
+     * @url GET /:prj_uid/email-event/:act_uid
+     *
+     * @param string $prj_uid {@min 1} {@max 32}
+     * @param string $act_uid {@min 1} {@max 32}
+     */
+    public function doGetEmailEvent($prj_uid, $act_uid )
+    {
+        try {
+            $response = $this->EmailEvent->getEmailEventData($act_uid);
+            return $response;
+        } catch (\Exception $e) {
+            throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+        }
+    }
+    
+    /**
+     * @url POST /:prj_uid/email-event
+     *
+     * @param string $prj_uid {@min 1} {@max 32}
+     */
+    public function doPostEmailEvent($prj_uid, array $request_data)
+    {
+        try {
+            $response = $this->EmailEvent->save($prj_uid, $request_data);
+            return $response;
+        } catch (\Exception $e) {
+            throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+        }
+    }
+    
+    /**
+     * @url PUT /:prj_uid/email-event/:email_event_uid
+     *
+     * @param string $prj_uid      {@min 32}{@max 32}
+     * @param string $email_event_uid    {@min 32}{@max 32}
+     * @param array  $request_data
+     */
+    public function doPutEmailEvent($prj_uid, $email_event_uid, array $request_data)
+    {
+        try {
+            $arrayData = $this->EmailEvent->update($email_event_uid, $request_data);
+        } catch (\Exception $e) {
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+    }
+    
+    /**
+     * @url DELETE /:prj_uid/email-event/:email_event_uid
+     *
+     * @param string $prj_uid   {@min 32}{@max 32}
+     * @param string $email_event_uid {@min 32}{@max 32}
+     */
+    public function doDeleteEmailEvent($prj_uid, $email_event_uid)
+    {
+        try {
+            $this->EmailEvent->delete($email_event_uid);
+        } catch (\Exception $e) {
+            throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
+        }
+    }
+
+}
+
diff --git a/workflow/engine/src/ProcessMaker/Services/api.ini b/workflow/engine/src/ProcessMaker/Services/api.ini
index d0d0aa063..43cff9eb2 100644
--- a/workflow/engine/src/ProcessMaker/Services/api.ini
+++ b/workflow/engine/src/ProcessMaker/Services/api.ini
@@ -41,6 +41,7 @@ debug = 1
     message-type-variable = "ProcessMaker\Services\Api\Project\MessageType\Variable"
     web-entry-event          = "ProcessMaker\Services\Api\Project\WebEntryEvent"
     message-event-definition = "ProcessMaker\Services\Api\Project\MessageEventDefinition"
+    email-event = "ProcessMaker\Services\Api\Project\EmailEvent"
 
 [alias: projects]
     project = "ProcessMaker\Services\Api\Project"