diff --git a/mozilla/calendar/base/content/calendar-task-view.js b/mozilla/calendar/base/content/calendar-task-view.js
index 1fec126ab10..492027de858 100644
--- a/mozilla/calendar/base/content/calendar-task-view.js
+++ b/mozilla/calendar/base/content/calendar-task-view.js
@@ -168,6 +168,12 @@ var taskDetailsView = {
             var description = item.hasProperty("DESCRIPTION") ? item.getProperty("DESCRIPTION") : null;
             textbox.value = description;
             textbox.inputField.readOnly = true;
+            var gURL = item.getProperty("URL");
+            if (displayElement("calendar-task-details-attachment-row", gURL && gURL.length)) {
+                var urlLabel = document.getElementById("calendar-task-details-attachment");
+                urlLabel.value = gURL;
+                urlLabel.setAttribute("tooltiptext", gURL);
+            }
         }
     }
 };
diff --git a/mozilla/calendar/base/content/calendar-task-view.xul b/mozilla/calendar/base/content/calendar-task-view.xul
index 268f389506c..30b7740444e 100644
--- a/mozilla/calendar/base/content/calendar-task-view.xul
+++ b/mozilla/calendar/base/content/calendar-task-view.xul
@@ -40,12 +40,16 @@
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
-<!DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendar.dtd">
+<!DOCTYPE overlay [
+  <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd2;
+]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
   <script type="application/x-javascript" src="chrome://calendar/content/calendar-task-view.js"/>
   <script type="application/x-javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script type="application/x-javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="displayDeck">
@@ -160,6 +164,17 @@
             </grid>
           </hbox>
           <textbox id="calendar-task-details-description" multiline="true" flex="1"/>
+          <hbox id="calendar-task-details-attachment-row"
+               align="top"
+               hidden="true">
+            <label value="&event.link.label;"
+                   class="task-details-name"/>
+            <label id="calendar-task-details-attachment"
+                   class="text-link"
+                   crop="end"
+                   flex="1"
+                   onclick="launchBrowser(this.value)"/>
+          </hbox>
         </vbox>
       </vbox>
     </vbox>
diff --git a/mozilla/calendar/base/themes/pinstripe/calendar-task-view.css b/mozilla/calendar/base/themes/pinstripe/calendar-task-view.css
index a22d9ea9086..a2ced1d7fca 100644
--- a/mozilla/calendar/base/themes/pinstripe/calendar-task-view.css
+++ b/mozilla/calendar/base/themes/pinstripe/calendar-task-view.css
@@ -39,11 +39,14 @@
     font-weight: bold;
     text-align: right;
     background-color: transparent;
+    border: none;
 }
 
+#calendar-task-details-attachment,
 .task-details-value {
     text-align: left;
     background-color: transparent;
+    border: none;
 }
 
 #calendar-task-tree {
diff --git a/mozilla/calendar/base/themes/winstripe/calendar-task-view.css b/mozilla/calendar/base/themes/winstripe/calendar-task-view.css
index 7b9e6d634d0..c439589c8f4 100644
--- a/mozilla/calendar/base/themes/winstripe/calendar-task-view.css
+++ b/mozilla/calendar/base/themes/winstripe/calendar-task-view.css
@@ -39,11 +39,14 @@
     font-weight: bold;
     text-align: right;
     background-color: transparent;
+    border: none;
 }
 
+#calendar-task-details-attachment,
 .task-details-value {
     text-align: left;
     background-color: transparent;
+    border: none;
 }
 
 #calendar-task-tree {