diff --git a/NEWS b/NEWS
index c73d92bce..ed595f415 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
 - added "Reload" button to refresh the current view in the calendar
 - fixed freebusy support for Apple iCal
 - added support for the calendar application of the iPhone OS v3
+- added the possibility to disable alarms or tasks from Web calendars
+- added support for printing cards
 
 1.0-20090714 (1.0.3)
 --------------------
diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
index a6bdefef9..5884e12a6 100755
--- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identidade";
 "Password" = "Senha";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Eu estou no escritório";
diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings
index a77706b0f..f984ab16f 100755
--- a/UI/PreferencesUI/Czech.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identity";
 "Password" = "Heslo";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Momentálně jsem v kanceláři";
diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
index cc7ef5f82..67adad840 100644
--- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identiteit";
 "Password" = "Wachtwoord";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Ik ben op kantoor";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index cec6ae29e..852ba9186 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identities";
 "Password" = "Password";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "I'm currently in the office";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 89a91d7c6..c4f2591fb 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identités";
 "Password" = "Mot de passe";
 "Categories" = "Catégories";
+"Name" = "Nom";
+"Color" = "Couleur";
+"Add" = "Ajouter";
+"Delete" = "Supprimer";
 
 /* ooo */
 "I'm currently in the office" = "Je suis présent";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 4d39bb4ce..36b31c80a 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identität";
 "Password" = "Passwort";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Ich bin zurzeit im Hause";
diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings
index df965074b..bbcc57134 100644
--- a/UI/PreferencesUI/Italian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identità";
 "Password" = "Password";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Sono in ufficio";
diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings
index 7d8f6dc6d..38e7b4337 100644
--- a/UI/PreferencesUI/Russian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "Identities";
 "Password" = "Пароль";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Я на рабочем месте";
diff --git a/UI/PreferencesUI/Spanish.lproj/Localizable.strings b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
index 3e10b52c5..8f0541c13 100644
--- a/UI/PreferencesUI/Spanish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
@@ -14,6 +14,10 @@
 "Identities" = "Identidades";
 "Password" = "Contraseña";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Ahora estoy disponible";
diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
index 57b6b035e..7df70137e 100644
--- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -9,6 +9,10 @@
 "Identities" = "hunaniaethau";
 "Password" = "Cyfrinair";
 "Categories" = "Categories";
+"Name" = "Name";
+"Color" = "Color";
+"Add" = "Add";
+"Delete" = "Delete";
 
 /* ooo */
 "I'm currently in the office" = "Yr wyf yn y swyddfa ar hyn o bryd";
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 1de416ebe..f9c2eb370 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -362,3 +362,37 @@ DIV.copy
   background-image: url(add-contact.gif) !important; 
   background-position: 1px -2px !important;
 }
+
+
+@media print
+{
+  div#linkBanner, 
+  div#toolbar,
+  div#contactFoldersList,
+  div#dragHandle,
+  div#rightDragHandle,
+  div.menu,
+  div#filterPanel,
+  div#contactsListContent
+  {
+    display: none;
+  }
+
+  div#contactView,
+  div#rightPanel
+  {
+    color: black;
+    top: 0px;
+    left: 0px;
+    margin: 0px;
+    border: none;
+    display: block;
+    visibility: visible;
+    width: 100%;
+    height: 100%;
+  }
+
+  div.contactColumn h4 {
+    background: none;
+  }
+}
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index fa7bc7919..5b0c84e44 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -744,6 +744,7 @@ function onWindowResize(event) {
       setTimeout ('onWindowResize ()', 100);
       return;
     }
+    editor.absolutize ();
     var content = $("cke_contents_text");
     var height = Math.floor(window.height() - editor.offsetTop);
 
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 3716c4dd7..8a48db4ed 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -64,7 +64,6 @@ function resetTableActions () {
   for (var i = 0; i < r.length; i++) {
       var row = $(r[i]);
       row.observe("mousedown", onRowClick);
-      row.observe("selectstart", listRowMouseDownHandler);
       var tds = row.childElements ();
       tds[0].observe("mousedown", endAllEditables);
       tds[0].observe ("dblclick", onNameEdit);
@@ -75,6 +74,7 @@ function resetTableActions () {
 
 function makeEditable (element) {
   element.addClassName ("editing");
+  element.removeClassName ("categoryListCell");
   var tmp = element.innerHTML;
   element.innerHTML = "";
   var textField = new Element ("input", {"type": "text", 
@@ -98,6 +98,7 @@ function endEditable (element) {
   var tmp = element.childElements ().first ().value;
   element.innerHTML = tmp;
   element.removeClassName ("editing");
+  element.addClassName ("categoryListCell");
 }
 
 function endAllEditables (e) {