diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 7e9bbacab13..683a247c8d1 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -19,15 +19,16 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
-from tools.translate import _
 from datetime import datetime
 from datetime import timedelta
+import re
+import time
+
+from osv import fields, osv, orm
+from tools.translate import _
 from tools.safe_eval import safe_eval
 from tools import ustr
 import pooler
-import re
-import time
 import tools
 
 
@@ -48,32 +49,21 @@ class base_action_rule(osv.osv):
     _description = 'Action Rules'
 
     def _state_get(self, cr, uid, context=None):
-        """ Get State
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get State """
         return self.state_get(cr, uid, context=context)
 
     def state_get(self, cr, uid, context=None):
-        """ Get State
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get State """
         return [('', '')]
 
     def priority_get(self, cr, uid, context=None):
-        """ Get Priority
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get Priority """
         return [('', '')]
 
     _columns = {
         'name':  fields.char('Rule Name', size=64, required=True),
-        'model_id': fields.many2one('ir.model', 'Object', required=True),
+        'model_id': fields.many2one('ir.model', 'Related Document Model', required=True, domain=[('osv_memory','=', False)]),
+        'model': fields.related('model_id', 'model', type="char", size=256, string='Model'),
         'create_date': fields.datetime('Create Date', readonly=1),
         'active': fields.boolean('Active', help="If the active field is set to False,\
  it will allow you to hide the rule without removing it."),
@@ -82,6 +72,7 @@ when displaying a list of rules."),
         'trg_date_type':  fields.selection([
             ('none', 'None'),
             ('create', 'Creation Date'),
+            ('write', 'Last Modified Date'),
             ('action_last', 'Last Action Date'),
             ('date', 'Date'),
             ('deadline', 'Deadline'),
@@ -98,78 +89,39 @@ trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_state_from': fields.selection(_state_get, 'Status', size=16),
         'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
 
-        'act_method': fields.char('Call Object Method', size=64),
         'act_user_id': fields.many2one('res.users', 'Set Responsible to'),
         'act_state': fields.selection(_state_get, 'Set State to', size=16),
-        'act_email_cc': fields.char('Add Watchers (Cc)', size=250, help="\
-These people will receive a copy of the future communication between partner \
-and users by email"),
-        'act_remind_partner': fields.boolean('Remind Partner', help="Check \
-this if you want the rule to send a reminder by email to the partner."),
-        'act_remind_user': fields.boolean('Remind Responsible', help="Check \
-this if you want the rule to send a reminder by email to the user."),
-        'act_reply_to': fields.char('Reply-To', size=64),
-        'act_remind_attach': fields.boolean('Remind with Attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."),
-        'act_mail_to_user': fields.boolean('Mail to Responsible', help="Check\
- this if you want the rule to send an email to the responsible person."),
-        'act_mail_to_watchers': fields.boolean('Mail to Watchers (CC)',
-                                                help="Check this if you want \
-the rule to mark CC(mail to any other person defined in actions)."),
-        'act_mail_to_email': fields.char('Mail to these Emails', size=128, \
-        help="Email-id of the persons whom mail is to be sent"),
-        'act_mail_body': fields.text('Mail body', help="Content of mail"),
+        'act_followers': fields.many2many("res.partner", string="Set Followers"),
         'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\
 \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\
 \nNote: This is case sensitive search."),
-        'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
-        'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
-        'act_email_from' : fields.char('Email From', size=64, required=False,
-                help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
-        'act_email_to' : fields.char('Email To', size=64, required=False,
-                                     help="Use a python expression to specify the right field on which one than we will use for the 'To' field of the header"),
+        'server_action_ids': fields.one2many('ir.actions.server', 'action_rule_id', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), #TODO: set domain [('model_id','=',model_id)]
+        'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model_id.model)]
         'last_run': fields.datetime('Last Run', readonly=1),
     }
 
     _defaults = {
-        'active': lambda *a: True,
-        'trg_date_type': lambda *a: 'none',
-        'trg_date_range_type': lambda *a: 'day',
-        'act_mail_to_user': lambda *a: 0,
-        'act_remind_partner': lambda *a: 0,
-        'act_remind_user': lambda *a: 0,
-        'act_mail_to_watchers': lambda *a: 0,
+        'active': True,
+        'trg_date_type': 'none',
+        'trg_date_range_type': 'day',
     }
 
     _order = 'sequence'
 
-    def onchange_model_id(self, cr, uid, ids, name):
-        #This is not a good solution as it will affect the domain only on onchange
-        res = {'domain':{'filter_id':[]}}
-        if name:
-            model_name = self.pool.get('ir.model').read(cr, uid, [name], ['model'])
-            if model_name:
-                mod_name = model_name[0]['model']
-                res['domain'] = {'filter_id': [('model_id','=',mod_name)]}
-        else:
-            res['value'] = {'filter_id':False}
-        return res
 
     def post_action(self, cr, uid, ids, model, context=None):
         # Searching for action rules
         cr.execute("SELECT model.model, rule.id  FROM base_action_rule rule \
                         LEFT JOIN ir_model model on (model.id = rule.model_id) \
-                        WHERE active")
+                        WHERE active and model = %s", (model,))
         res = cr.fetchall()
         # Check if any rule matching with current object
         for obj_name, rule_id in res:
-            if not (model == obj_name):
-                continue # TODO add this condition in the WHERE clause above.
-            else:
-                obj = self.pool.get(obj_name)
-                # If the rule doesn't involve a time condition, run it immediately
-                # Otherwise we let the scheduler run the action
-                if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none':
-                    self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context)
+            obj = self.pool.get(obj_name)
+            # If the rule doesn't involve a time condition, run it immediately
+            # Otherwise we let the scheduler run the action
+            if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none':
+                self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context)
         return True
 
     def _create(self, old_create, model, context=None):
@@ -232,24 +184,30 @@ the rule to mark CC(mail to any other person defined in actions)."),
         """
         This Function is call by scheduler.
         """
-        rule_pool = self.pool.get('base.action.rule')
-        rule_ids = rule_pool.search(cr, uid, [], context=context)
+        rule_ids = self.search(cr, uid, [], context=context)
         self._register_hook(cr, uid, rule_ids, context=context)
-
-        rules = self.browse(cr, uid, rule_ids, context=context)
-        for rule in rules:
+        if context is None:
+            context = {}
+        for rule in self.browse(cr, uid, rule_ids, context=context):
             model = rule.model_id.model
             model_pool = self.pool.get(model)
             last_run = False
             if rule.last_run:
                 last_run = get_datetime(rule.last_run)
             now = datetime.now()
-            for obj_id in model_pool.search(cr, uid, [], context=context):
-                obj = model_pool.browse(cr, uid, obj_id, context=context)
+            ctx = dict(context)            
+            if rule.filter_id and rule.model_id.model == rule.filter_id.model_id:
+                ctx.update(eval(rule.filter_id.context))
+                obj_ids = model_pool.search(cr, uid, eval(rule.filter_id.domain), context=ctx)
+            else:
+                obj_ids = model_pool.search(cr, uid, [], context=ctx)
+            for obj in model_pool.browse(cr, uid, obj_ids, context=ctx):
                 # Calculate when this action should next occur for this object
                 base = False
                 if rule.trg_date_type=='create' and hasattr(obj, 'create_date'):
                     base = obj.create_date
+                elif rule.trg_date_type=='write' and hasattr(obj, 'write_date'):
+                    base = obj.write_date
                 elif (rule.trg_date_type=='action_last'
                         and hasattr(obj, 'create_date')):
                     if hasattr(obj, 'date_action_last') and obj.date_action_last:
@@ -275,73 +233,25 @@ the rule to mark CC(mail to any other person defined in actions)."),
                     delay = fnct[rule.trg_date_range_type](rule.trg_date_range)
                     action_date = base + delay
                     if (not last_run or (last_run <= action_date < now)):
-                        self._action(cr, uid, [rule.id], [obj], context=context)
-            rule_pool.write(cr, uid, [rule.id], {'last_run': now},
-                            context=context)
-
-    def format_body(self, body):
-        """ Foramat Action rule's body
-            @param self: The object pointer """
-        return body and tools.ustr(body) or ''
-
-    def format_mail(self, obj, body):
-        data = {
-            'object_id': obj.id,
-            'object_subject': hasattr(obj, 'name') and obj.name or False,
-            'object_date': hasattr(obj, 'date') and obj.date or False,
-            'object_description': hasattr(obj, 'description') and obj.description or False,
-            'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
-            'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
-                                     obj.user_id.email) or '/',
-            'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and \
-                                     obj.partner_address_id.phone) or '/',
-            'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
-            'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
-                                         obj.partner_address_id.email) or '/',
-        }
-        return self.format_body(body % data)
-
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
-        if not emailfrom:
-            emailfrom = tools.config.get('email_from')
-        body = self.format_mail(obj, body)
-        if not emailfrom and hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-            emailfrom = obj.user_id.email
-        emailfrom = tools.ustr(emailfrom)
-        reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'),
-                                 _("Missing default email address or missing email on responsible user"))
-        return self.pool.get('mail.mail').create(cr, uid,
-                {   'email_from': emailfrom,
-                    'email_to': emails.join(','),
-                    'reply_to': reply_to,
-                    'state': 'outgoing',
-                    'subject': '[%d] %s' % (obj.id, tools.ustr(obj.name)),
-                    'body_html': '<pre>%s</pre>' % body,
-                    'res_id': obj.id,
-                    'model': obj._table_name,
-                    'auto_delete': True
-                }, context=context)
-
+                        try:
+                            self._action(cr, uid, [rule.id], obj, context=ctx)
+                            self.write(cr, uid, [rule.id], {'last_run': now}, context=context)
+                        except Exception, e:
+                            import traceback
+                            print traceback.format_exc()
+                        
+                        
 
     def do_check(self, cr, uid, action, obj, context=None):
-        """ check Action
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ check Action """
         if context is None:
             context = {}
         ok = True
-        if action.filter_id:
-            if action.model_id.model == action.filter_id.model_id:
-                context.update(eval(action.filter_id.context))
-                obj_ids = obj._table.search(cr, uid, eval(action.filter_id.domain), context=context)
-                if not obj.id in obj_ids:
-                    ok = False
-            else:
-                ok = False
+        if action.filter_id and action.model_id.model == action.filter_id.model_id:
+            ctx = dict(context)
+            ctx.update(eval(action.filter_id.context))
+            obj_ids = self.pool.get(action.model_id.model).search(cr, uid, eval(action.filter_id.domain), context=ctx)
+            ok = ok and obj.id in obj_ids
         if getattr(obj, 'user_id', False):
             ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id)
         if getattr(obj, 'partner_id', False):
@@ -372,120 +282,62 @@ the rule to mark CC(mail to any other person defined in actions)."),
         ok = ok and regex_n
         return ok
 
-    def do_action(self, cr, uid, action, model_obj, obj, context=None):
-        """ Do Action
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param action: pass action
-            @param model_obj: pass Model object
-            @param context: A standard dictionary for contextual values """
+    def do_action(self, cr, uid, action, obj, context=None):
+        """ Do Action """
         if context is None:
             context = {}
+        ctx = dict(context)
+        model_obj = self.pool.get(action.model_id.model)
+        action_server_obj = self.pool.get('ir.actions.server')
+        if action.server_action_ids:
+            ctx.update({'active_model': action.model_id.model, 'active_id':obj.id, 'active_ids':[obj.id]})
+            action_server_obj.run(cr, uid, [x.id for x in action.server_action_ids], context=ctx)
 
-        if action.server_action_id:
-            context.update({'active_id':obj.id, 'active_ids':[obj.id]})
-            self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
         write = {}
-
         if hasattr(obj, 'user_id') and action.act_user_id:
-            obj.user_id = action.act_user_id
             write['user_id'] = action.act_user_id.id
         if hasattr(obj, 'date_action_last'):
             write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
         if hasattr(obj, 'state') and action.act_state:
-            obj.state = action.act_state
             write['state'] = action.act_state
-
-        if hasattr(obj, 'categ_id') and action.act_categ_id:
-            obj.categ_id = action.act_categ_id
-            write['categ_id'] = action.act_categ_id.id
-
+        
         model_obj.write(cr, uid, [obj.id], write, context)
-
-        if hasattr(model_obj, 'remind_user') and action.act_remind_user:
-            model_obj.remind_user(cr, uid, [obj.id], context, attach=action.act_remind_attach)
-        if hasattr(model_obj, 'remind_partner') and action.act_remind_partner:
-            model_obj.remind_partner(cr, uid, [obj.id], context, attach=action.act_remind_attach)
-        if action.act_method:
-            getattr(model_obj, 'act_method')(cr, uid, [obj.id], action, context)
-
-        emails = []
-        if hasattr(obj, 'user_id') and action.act_mail_to_user:
-            if obj.user_id:
-                emails.append(obj.user_id.email)
-
-        if action.act_mail_to_watchers:
-            emails += (action.act_email_cc or '').split(',')
-        if action.act_mail_to_email:
-            emails += (action.act_mail_to_email or '').split(',')
-
-        locals_for_emails = {
-            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-            'obj' : obj,
-        }
-
-        if action.act_email_to:
-            emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
-
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
-            emails = tools.email_split(','.join(filter(None, emails)))
-            email_froms = tools.email_split(email_from)
-            if email_froms:
-                self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
+        if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
+            model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)
+        
+        if hasattr(obj, 'message_subscribe') and action.act_followers:
+            exits_followers = [x.id for x in obj.message_follower_ids]
+            new_followers = [x.id for x in action.act_followers if x.id not in exits_followers]
+            if new_followers:
+                model_obj.message_subscribe(cr, uid, [obj.id], new_followers, context=context)
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context=None):
-        """ Do Action
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Basic Action Rule’s IDs,
-            @param objects: pass objects
-            @param context: A standard dictionary for contextual values """
+        """ Do Action """
         if context is None:
             context = {}
 
         context.update({'action': True})
         if not scrit:
             scrit = []
-
+        if not isinstance(objects, list):
+            objects = [objects]
         for action in self.browse(cr, uid, ids, context=context):
             for obj in objects:
                 if self.do_check(cr, uid, action, obj, context=context):
-                    model_obj = self.pool.get(action.model_id.model)
-                    self.do_action(cr, uid, action, model_obj, obj, context=context)
+                    self.do_action(cr, uid, action, obj, context=context)
 
         context.update({'action': False})
         return True
 
-    def _check_mail(self, cr, uid, ids, context=None):
-        """ Check Mail
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Action Rule’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        empty = orm.browse_null()
-        rule_obj = self.pool.get('base.action.rule')
-        for rule in self.browse(cr, uid, ids, context=context):
-            if rule.act_mail_body:
-                try:
-                    rule_obj.format_mail(empty, rule.act_mail_body)
-                except (ValueError, KeyError, TypeError):
-                    return False
-        return True
-
-    _constraints = [
-        (_check_mail, 'Error ! The mail is not well formated.', ['act_mail_body']),
-    ]
-
 base_action_rule()
 
+class actions_server(osv.osv):
+    _inherit = 'ir.actions.server'
+    _columns = {
+        'action_rule_id': fields.many2one("base.action.rule", string="Action Rule")
+    }
+actions_server()
 
 class ir_cron(osv.osv):
     _inherit = 'ir.cron'
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 0d268438a41..fe8ff9b181f 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -15,8 +15,9 @@
                     <sheet>
                         <group col="4">
                             <field name="name"/>
-                            <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                            <field name="filter_id" />
+                            <field name="model_id"/>
+                            <field name="model" invisible="1"/>
+                            <field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
                             <field name="sequence"/>
                             <field name="active"/>
                         </group>
@@ -31,62 +32,40 @@
                                         <field name="trg_partner_id"/>
                                         <field name="trg_partner_categ_id"/>
                                     </group>
-                                    <group string="Conditions on States">
+                                    <group name="state" string="Conditions on Status">
                                         <field name="trg_state_from"/>
                                         <field name="trg_state_to"/>
                                     </group>
-                                    <group string="Conditions on Timing">
+                                    <group name="timing" string="Conditions on Timing">
                                         <field name="trg_date_type"/>
-                                        <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
-                                            <field name="trg_date_range" string="Delay After Trigger Date"/>
-                                            <field name="trg_date_range_type"/>
-                                        </group>
+                                        <field name="trg_date_range" string="Delay After Trigger Date" attrs="{'invisible': [('trg_date_type', '=', 'none')]}"/>
+                                        <field name="trg_date_range_type" attrs="{'invisible': [('trg_date_type', '=', 'none')]}"/>
                                     </group>
                                 </group>
-                                <separator string="Note"/>
-                                <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                                <group string="Note">
+                                    <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action  described in the 'Actions' tab." />
+                                </group>
                             </page>
                             <page string="Actions">
-                                <group string="Fields to Change" col="4">
+                                <group name="action_followers">
+                                    <field name="act_followers" widget="many2many_tags"/>
+                                </group>
+                                <group name="action_field" col="4" string="Fields to Change">
                                     <field name="act_user_id"/>
                                     <field name="act_state"/>
                                 </group>
-                                <group col="2" string="Server Action to be Triggered">
-                                    <field name="server_action_id"/>
+                                <group name="action_server" string="Server Actions to be Triggered (eg. Email Reminder, Call Object Method, etc...)" >
+                                    <field name="server_action_ids" domain="[('model_id','=', model_id)]" nolabel="1" context="{'default_model_id': model_id}">
+                                        <tree string="Server Actions">
+                                            <field name="sequence"/>
+                                            <field name="name"/>
+                                            <field name="state"/>
+                                        </tree>
+                                    </field>
                                 </group>
-                            </page>
-                            <page string="Email Actions">
-                                <group col="4">
-                                    <separator colspan="4" string="Email Reminders"/>
-                                    <field name="act_remind_partner"/>
-                                    <field name="act_remind_attach"/>
-                                    <field name="act_remind_user"/>
-                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
-                                    </group>
-                                    <separator colspan="4" string="Email Information"/>
-                                    <field name="act_email_from" />
-                                    <field name="act_email_to" />
-                                    <field name="act_mail_to_user"/>
-                                    <field colspan="4" name="act_mail_to_email"/>
-                                    <field name="act_mail_to_watchers"/>
-                                    <field colspan="4" name="act_email_cc"/>
-                                    <separator colspan="4" string="Email Body"/>
-                                    <field colspan="4" name="act_mail_body" height="250"
-                                        nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
-                                    <separator colspan="4" string="Special Keywords to be Used in the Body"/>
-                                    <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
-                                    <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
-                                    <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
-                                    <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
-                                    <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                                    <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                                </group>
-                            </page>
-                        </notebook>
+                                
+                           </page>
+                       </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 617af125215..867b2207a99 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -302,50 +302,13 @@ class base_stage(object):
         rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])], context=context)
         return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
 
-    def remind_partner(self, cr, uid, ids, context=None, attach=False):
-        return self.remind_user(cr, uid, ids, context, attach,
-                destination=False)
-
-    def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        if hasattr(self, 'message_post'):
-            for case in self.browse(cr, uid, ids, context=context):
-                if destination:
-                    recipient_id = case.user_id.partner_id.id
-                else:
-                    if not case.email_from:
-                        return False
-                    recipient_id = self.pool.get('res.partner').find_or_create(cr, uid, case.email_from, context=context)
-                
-                body = case.description or ""
-                for message in case.message_ids:
-                    if message.type == 'email' and message.body:
-                        body = message.body
-                        break
-                body = self.format_body(body)
-                attach_to_send = {}
-                if attach:
-                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
-                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
-                    attach_to_send = dict(map(lambda x: (x['datas_fname'], x['datas'].decode('base64')), attach_to_send))
- 
-                subject = "Reminder: [%s] %s" % (case.id, case.name)
-                self.message_post(cr, uid, case.id, body=body,
-                    subject=subject, attachments=attach_to_send, 
-                    partner_ids=[recipient_id], context=context)
-        return True
-
+    
     def _check(self, cr, uid, ids=False, context=None):
         """ Function called by the scheduler to process cases for date actions.
             Must be overriden by inheriting classes.
         """
         return True
 
-    def format_body(self, body):
-        return self.pool.get('base.action.rule').format_body(body)
-
-    def format_mail(self, obj, body):
-        return self.pool.get('base.action.rule').format_mail(obj, body)
-
     # ******************************
     # Notifications
     # ******************************
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index dd36aa19041..ddeded0926e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -107,6 +107,7 @@ Dashboard for CRM will include:
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_phonecall_demo.xml',
+        'crm_action_rule_demo.xml',
     ],
     'test': [
         'test/process/communication_with_customer.yml',
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 8b1ba655afc..910a1fca169 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -41,24 +41,15 @@ class base_action_rule(osv.osv):
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
         'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
-        'act_mail_to_partner': fields.boolean('Mail to Partner',
-                                              help="Check this if you want the rule to send an email to the partner."),
     }
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
-        mail_id = super(base_action_rule, self).email_send(cr, uid, obj, emails, body, emailfrom=emailfrom, context=context)
-        if mail_id and hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
-            reply_to = obj.section_id.alias_id.name_get()[0][1]
-            self.pool.get('mail.mail').write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
-        return mail_id
-
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
 
         if hasattr(obj, 'section_id'):
             ok = ok and (not action.trg_section_id or action.trg_section_id.id == obj.section_id.id)
-        if hasattr(obj, 'categ_id'):
-            ok = ok and (not action.trg_categ_id or action.trg_categ_id.id == obj.categ_id.id)
+        if hasattr(obj, 'categ_ids'):
+            ok = ok and (not action.trg_categ_id or action.trg_categ_id.id in [x.id for x in obj.categ_ids])
 
         #Cheking for history
         regex = action.regex_history
@@ -80,36 +71,18 @@ class base_action_rule(osv.osv):
             ok = ok and res_count
         return ok
 
-    def do_action(self, cr, uid, action, model_obj, obj, context=None):
+    def do_action(self, cr, uid, action, obj, context=None):
+        res = super(base_action_rule, self).do_action(cr, uid, action, obj, context=context)
+        model_obj = self.pool.get(action.model_id.model)
         write = {}
         if hasattr(action, 'act_section_id') and action.act_section_id:
-            obj.section_id = action.act_section_id
             write['section_id'] = action.act_section_id.id
 
-        if hasattr(obj, 'email_cc') and action.act_email_cc:
-            if '@' in (obj.email_cc or ''):
-                emails = obj.email_cc.split(",")
-                if  obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails:
-                    write['email_cc'] = obj.email_cc + ',' + obj.act_email_cc
-            else:
-                write['email_cc'] = obj.act_email_cc
-
-        # Put state change by rule in communication history
-        if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
-            model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)
+        if hasattr(action, 'act_categ_id') and action.act_categ_id:
+            write['categ_ids'] = [4, action.act_categ_id.id]                        
 
         model_obj.write(cr, uid, [obj.id], write, context)
-        super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
-        emails = []
-
-        if hasattr(obj, 'email_from') and action.act_mail_to_partner:
-            emails.append(obj.email_from)
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            self.email_send(cr, uid, obj, emails, action.act_mail_body)
-        return True
-
+        return res
 
     def state_get(self, cr, uid, context=None):
         """Gets available states for crm"""
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
new file mode 100644
index 00000000000..85cb8de1ac9
--- /dev/null
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+        <!-- email server actions -->
+        <record id="action_email_reminder_lead" model="ir.actions.server">
+            <field name="name">Reminder to User</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">object.user_id.email</field>
+            <field name="subject">Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']]</field>
+            <field name="message">Hello [[object.user_id.name]], 
+can you check following lead, it's not open since 5 days ?
+
+Lead: [[object.id ]]
+Description:
+
+    [[object.description]]
+
+Thanks,
+            </field>
+        </record>
+
+        <record id="action_email_reminder_customer_lead" model="ir.actions.server">
+            <field name="name">Reminder to Customer</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">object.email_from</field>
+            <field name="subject">Reminder on Lead: [[object.id ]]</field>
+            <field name="message">Hello [[object.partner_id and object.partner_id.name or '']], 
+your following lead is not open since 5 days.
+
+Lead: [[object.id ]]
+Description:
+
+    [[object.description]]
+
+Thanks,
+            </field>
+        </record>
+
+        <record id="filter_draft_lead" model="ir.filters">
+            <field name="name">Filter on leads which are draft.</field>
+            <field name="model_id">crm.lead</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+
+        <!-- automated actions -->
+        <record id="rule_set_reminder_lead" model="base.action.rule">
+            <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="sequence">1</field>
+            <field name="filter_id" ref="filter_draft_lead"/>
+            <field name="trg_date_type">create</field>
+            <field name="trg_date_range">5</field>
+            <field name="trg_date_range_type">day</field>
+            <field name="server_action_ids" eval="[(6,0,[ref('action_email_reminder_customer_lead'), ref('action_email_reminder_lead')])]"/>
+        </record>
+
+        <record id="filter_usa_lead" model="ir.filters">
+            <field name="name">Filter on leads which come from USA.</field>
+            <field name="model_id">crm.lead</field>
+            <field name="domain">[('country_id','=','United States')]</field>
+        </record>
+
+        <record id="rule_set_followers_lead" model="base.action.rule">
+            <field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="sequence">2</field>
+            <field name="regex_name">urgent.*</field>
+            <field name="filter_id" ref="filter_usa_lead"/>
+            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
+            <field name="act_user_id" ref="base.user_root"/>
+            <field name="act_section_id" ref="section_sales_department"/>
+            <field name="trg_date_type">create</field>
+            <field name="trg_date_range">0</field>
+            <field name="trg_date_range_type">minutes</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml
index f2a5f57702d..e21b74de382 100644
--- a/addons/crm/crm_action_rule_view.xml
+++ b/addons/crm/crm_action_rule_view.xml
@@ -7,53 +7,21 @@
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
             <field name="arch" type="xml">
-                <group name="partner" position="after">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Condition on Communication History"/>
+                <xpath expr="//group[@name='partner']" position="after">
+                    <group name="case" string="Conditions on Case Fields">
+                        <field name="trg_section_id" widget="selection"/>
+                        <field name="trg_categ_id"/>
+                    </group>
+                    <group name="communication" string="Conditions on Communication History">
                         <field name="regex_history"/>
                         <field name="trg_max_history"/>
                     </group>
-                </group>
-            </field>
-       </record>
-
-       <record id="view_base_action_rule_line_form2" model="ir.ui.view">
-            <field name="name">base.action.rule.form2.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <group name="partner" position="after">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Condition Case Fields"/>
-                        <field name="trg_section_id"  widget="selection"/>
-                        <field name="trg_categ_id"/>
-                    </group>
-                </group>
-            </field>
-       </record>
-
-       <record id="view_base_action_rule_line_form3" model="ir.ui.view">
-            <field name="name">base.action.rule.form3.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <field name="act_user_id" position="after">
+                </xpath>
+                <xpath expr="//field[@name='act_user_id']" position="after">
                     <field name="act_section_id"/>
                     <field name="act_categ_id"/>
-                </field>
+                </xpath>
             </field>
        </record>
-       
-       <record id="view_base_action_rule_line_form4" model="ir.ui.view">
-            <field name="name">base.action.rule.form4.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <field name="act_mail_to_user" position="after">
-                    <field name="act_mail_to_partner"/>
-                </field>
-            </field>
-       </record>
-
     </data>
 </openerp>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index eafe5d09844..d2214f5e14f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -231,7 +231,7 @@ class hr_employee(osv.osv):
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
-            return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
+            return {'value': {'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
     def onchange_company(self, cr, uid, ids, company, context=None):