diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 09d1c739..76464c26 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -598,10 +598,11 @@ class calendar extends rcube_plugin
     $end = get_input_value('end', RCUBE_INPUT_GET);
     if (!$start) $start = mktime(0, 0, 0, 1, date('n'), date('Y')-1);
     if (!$end) $end = mktime(0, 0, 0, 31, 12, date('Y')+10);
-    $events = $this->driver->load_events($start, $end, null, get_input_value('source', RCUBE_INPUT_GET), 0);
+	$calendar_name = get_input_value('source', RCUBE_INPUT_GET);
+    $events = $this->driver->load_events($start, $end, null, $calendar_name, 0);
    
     header("Content-Type: text/calendar");
-    header("Content-Disposition: inline; filename=calendar.ics");
+    header("Content-Disposition: inline; filename=".$calendar_name);
     
     echo $this->ical->export($events);
     exit;
diff --git a/plugins/calendar/lib/calendar_ical.php b/plugins/calendar/lib/calendar_ical.php
index 66cd9ee9..d2e06cb5 100644
--- a/plugins/calendar/lib/calendar_ical.php
+++ b/plugins/calendar/lib/calendar_ical.php
@@ -67,7 +67,7 @@ class calendar_ical
         $ical .= "DTSTART:" . gmdate('Ymd\THis\Z', $event['start']) . "\r\n";
         $ical .= "DTEND:" . gmdate('Ymd\THis\Z', $event['end']) . "\r\n";
         $ical .= "SUMMARY:" . self::escpape($event['title']) . "\r\n";
-        $ical .= "DESCRIPTION:" . wordwrap(self::escpape($event['description']),75,'\r\n ') . "\r\n";
+        $ical .= "DESCRIPTION:" . wordwrap(self::escpape($event['description']),75,"\r\n ") . "\r\n";
 		
 		if (!empty($event['attendees'])){