diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 1158d45b564..5c857209794 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -89,22 +89,6 @@ class crm_meeting(osv.osv):
         'rrule_type' : fields.selection([('none', 'None'), ('daily', 'Daily'), \
                  ('weekly', 'Weekly'), ('monthly', 'Monthly'), ('yearly', 'Yearly'), ('custom','Custom')], 'Recurrency'), 
         'attendees': fields.text('Attendees'),
-        'alarms': fields.text('Alarms'),
-        'alarm_type': fields.selection([('none', 'Never'), 
-                                        ('1_min_before', '1 minute before'), 
-                                        ('5_min_before', '5 minutes before'), 
-                                        ('10_min_before', '10 minutes before'), 
-                                        ('15_min_before', '15 minutes before'), 
-                                        ('30_min_before', '30 minutes before'), 
-                                        ('45_min_before', '45 minutes before'), 
-                                        ('1_hour_before', '1 hour before'), 
-                                        ('2_hour_before', '2 hours before'),
-                                        ('3_hour_before', '3 hours before'), 
-                                        ('4_hour_before', '4 hours before'),
-                                        ('5_hour_before', '5 hours before'), 
-                                        ('18_hour_before', '18 hours before'), 
-                                        ('custom', 'Custom')
-                                    ],'Reminder'),  
         'alarm_id': fields.many2one('crm.caldav.alarm', 'Alarm'), 
         'attendee_ids' : fields.many2many('res.users', 'crm_meeting_attendee_rel',
             'crm_meeting_id', 'user_id', 'Attendee')
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 8d9a9b52426..1a9c320dbf7 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -74,5 +74,125 @@
 			<field eval="'(False,)'" name="args" />
 		</record>
 
+	<record model="crm.caldav.alarm" id="alarm1">
+        <field name="name">1 minute before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="1"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm2">
+        <field name="name">5 minutes before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="5"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm3">
+        <field name="name">10 minutes before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="10"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm4">
+        <field name="name">15 minutes before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="15"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm5">
+        <field name="name">30 minutes before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="30"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm6">
+        <field name="name">45 minutes before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="45"/>
+        <field name="trigger_interval">MINUTES</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm7">
+        <field name="name">1 hour before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="1"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm8">
+        <field name="name">2 hours before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="2"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm9">
+        <field name="name">3 hours before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="3"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm10">
+        <field name="name">4 hours before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="4"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+    <record model="crm.caldav.alarm" id="alarm11">
+        <field name="name">5 hours before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="5"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
+     <record model="crm.caldav.alarm" id="alarm12">
+        <field name="name">18 hours before</field>
+        <field name="action">EMAIL</field>
+        <field name="active" eval="1"/>
+        <field name="trigger_duration" eval="18"/>
+        <field name="trigger_interval">HOURS</field>
+        <field name="trigger_occurs">BEFORE</field>
+        <field name="trigger_related">start</field>
+    </record>
+    
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 00373588af7..ac955e1dc59 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -107,12 +107,7 @@
                 <notebook colspan="4">
 	                <page string="Meeting">                                              
                         <group colspan="2" col="3">          			                   
-                            <field name="alarm_type" colspan="1" string="Alarm"/>
-                            <button string="Custom"
-            					name="custom_alarm_wizard" 
-            					icon="gtk-save-as"  context="{'model' : 'crm.meeting'}" 
-                                attrs="{'invisible':[('alarm_type','!=','custom')]}"
-                                />
+                            <field name="alarm_id" colspan="1" string="Alarm"/>
                         </group>
                         <group colspan="2" col="3">
                             <field name="rrule_type" string="Recurrency" colspan="1"/>