diff --git a/NEWS b/NEWS
index cbad960cb..4a462e944 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Bug fixes
  - [web] the login module parameter is now properly restored when set as "Last used"
  - [web] if cn isn't found for shared mailboxes, use email address (#3733)
  - [web] fixed handling of attendees when updating an event
+ - [web] show tooltips over long calendar/ab names (#232)
 
 3.1.2 (2016-06-06)
 ------------------
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index eb3f8c440..107bf0f5f 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -50,7 +50,10 @@
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>contacts</md-icon>
               <p class="sg-item-name"
-                 ng-show="app.editMode!=folder.id">{{folder.name}}</p>
+                 ng-show="app.editMode!=folder.id">
+		{{folder.name}}
+		<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
+	      </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode == folder.id">
                 <input class="sg-item-name" type="text"
@@ -133,7 +136,10 @@
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>contacts</md-icon>
               <p class="sg-item-name"
-                 ng-show="editMode!=folder.id">{{folder.name}}</p>
+                 ng-show="app.editMode!=folder.id">
+		{{folder.name}}
+		<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
+	      </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode==folder.id">
                 <input class="sg-item-name" type="text"
@@ -184,7 +190,10 @@
                           ui-sref="app.addressbook({addressbookId: folder.id})"
                           ui-sref-active="md-default-theme md-background md-bg md-hue-1">
               <md-icon>public</md-icon>
-              <p class="sg-item-name">{{folder.name}}</p>
+              <p class="sg-item-name">
+		{{folder.name}}
+		<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
+	      </p>
             </md-list-item>
           </md-list>
         </section>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 3a0b866a3..3474d1eea 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -63,6 +63,7 @@
                  ng-dblclick="app.editFolder(calendar)"
                  ng-show="app.editMode != calendar.id">
                 {{calendar.name}}
+		<md-tooltip md-delay="2000">{{calendar.name}}</md-tooltip>
                 <span class="sg-counter-badge" ng-show="calendar.activeTasks">{{calendar.activeTasks}}</span>
               </p>
               <md-input-container class="md-flex"
@@ -157,11 +158,13 @@
                            ng-class="calendar.getClassName('checkbox')"
                            ng-true-value="1"
                            ng-false-value="0"
-                           label:aria-label="Enable"><!-- enable --></md-checkbox>
+                           label:aria-label="Enable"><!-- enable -->
+	      </md-checkbox>
               <p class="sg-item-name"
                  ng-dblclick="app.editFolder(calendar)"
                  ng-show="app.editMode != calendar.id">
                 {{calendar.name}}
+		<md-tooltip md-delay="2000">{{calendar.name}}</md-tooltip>
                 <span class="sg-counter-badge" ng-show="calendar.activeTasks">{{calendar.activeTasks}}</span>
               </p>
               <md-input-container class="md-flex"
@@ -240,6 +243,7 @@
                   <md-icon class="md-warn">warning</md-icon>
                   <md-tooltip>{{ calendar.$error }}</md-tooltip>
                 </span>
+		<md-tooltip md-delay="2000">{{calendar.name}}</md-tooltip>
                 {{calendar.name}}
               </p>
               <md-input-container class="md-flex"