--- ./lib/Driver.php-old	2007-11-18 22:06:55.000000000 +0100
+++ ./lib/Driver.php	2007-11-18 22:08:58.000000000 +0100
@@ -1987,9 +1987,31 @@
             }
         }
 
+        if (!$this->isAllDay()) {
+            if (($cmp = $this->start->compareDate($this->end)) > 0) {
+                $df = $prefs->getValue('date_format');
+                if ($cmp > 0) {
+                        $link .= strftime($df, $this->end->timestamp()) . '-' .  strftime($df, $this->start->timestamp());
+                } else {
+                        $link .= strftime($df, $this->start->timestamp()) . '-' .
+                            strftime($df, $this->end->timestamp());
+                }
+            } else {
+                $link .= date($prefs->getValue('twentyFour') ? 'G:i' : 'g:ia',
+                             $this->start->timestamp()) . '-' .
+                             date($prefs->getValue('twentyFour') ? 'G:i' : 'g:ia',
+                             $this->end->timestamp());
+            }
+            $link .= ': ';
+        }
+
         $link .= @htmlspecialchars($this->getTitle(), ENT_QUOTES,
                                    NLS::getCharset());
 
+        if ($this->location) {
+               $link .= ' ('. $this->location .')';
+        }
+
         if (isset($this->remoteCal) ||
             (!is_a($share, 'PEAR_Error') &&
              $share->hasPermission(Auth::getAuth(), PERMS_READ,