diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index 4426014e509..9171bc435e0 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -151,50 +151,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>
@@ -219,9 +227,9 @@
                                 </table>
                             </div>
                             <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="${/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
                             </div> 
                         </div>
                     </body>
@@ -265,7 +273,7 @@
                             </div>
                             <div style="height: auto;margin-left:12px;margin-top:30px;">
                                 <table>
-                                    <tr>
+                                    <tr>                                        
                                         <td>
                                             <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.date, 'dayname')}</div>
                                             <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
@@ -276,50 +284,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>
@@ -341,12 +357,12 @@
                                             </table>
                                         </td>
                                     </tr>
-                                </table>
+                                </table>                                      
                             </div>
                             <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
                             </div>                             
                         </div>
                     </body>
@@ -400,50 +416,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>