diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 3fb557a86b6..70395eecb10 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -71,7 +71,10 @@ def get_attribute_mapping(cr, uid, calname, context={}):
         pool = pooler.get_pool(cr.dbname)
         field_obj = pool.get('basic.calendar.fields')
         type_obj = pool.get('basic.calendar.lines')
-        type_id = type_obj.search(cr, uid, [('object_id.model', '=', context.get('model'))])
+        domain = [('object_id.model', '=', context.get('model'))]
+        if context.get('calendar_id'):
+            domain.append(('calendar_id', '=', context.get('calendar_id')))
+        type_id = type_obj.search(cr, uid, domain)
         fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
         res = {}
         for field in field_obj.browse(cr, uid, fids):
@@ -361,7 +364,9 @@ class Calendar(CalDAV, osv.osv):
             mod_obj = self.pool.get(line.object_id.model)
             data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
             datas = mod_obj.read(cr, uid, data_ids, context=context)
-            context.update({'model': line.object_id.model})
+            context.update({'model': line.object_id.model, 
+                                    'calendar_id': cal.id
+                                    })
             self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
             self.create_ics(cr, uid, datas, line.name, ical, context=context)
         return ical.serialize()
@@ -380,7 +385,9 @@ class Calendar(CalDAV, osv.osv):
             cal_children[line.name] = line.object_id.model
         for child in parsedCal.getChildren():
             if child.name.lower() in cal_children:
-                context.update({'model': cal_children[child.name.lower()]})
+                context.update({'model': cal_children[child.name.lower()], 
+                                'calendar_id': cal.id
+                                })
                 self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
                 val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
                 obj = self.pool.get(cal_children[child.name.lower()])
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 559c45485cc..54aaea8c5f4 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -264,5 +264,12 @@
 			name="My Invitations" parent="base_calendar.menu_calendar_configuration"
 			sequence="10" action="action_view_attendee_form" />
         
+        <!--	Available alarms-->
+
+	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
+		action="caldav.action_res_alarm_view"
+		parent="base_calendar.menu_calendar_configuration" />
+		
+		
     </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 678bc72a27d..c18a6e4554d 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -42,12 +42,6 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-<!--	Available alarms-->
-
-	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
-		action="caldav.action_res_alarm_view"
-		parent="menu_crm_configuration" />
-		
 	<act_window
         id="crm_case_categ_meet_case"
         name="Schedule a Meeting"