diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 3a3822810b..d87ce7db4a 100644
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 20793 2009-05-18 17:56:23Z iflorespaz $
+<?php //$Id: agenda.inc.php 20920 2009-05-20 20:40:12Z aportugal $
 /* For licensing terms, see /dokeos_license.txt */
 /*
 ==============================================================================
@@ -427,8 +427,10 @@ function display_monthcalendar($month, $year)
 						foreach ($agenda_item as $key=>$value) {
 							$month_start_date = (int)substr($value['start_date'],5,2);
 							if ($month == $month_start_date) {
+								$start_time= date("H:i",strtotime($value['start_date']));
+								$end_time= date("H:i",strtotime($value['end_date']));
 								$dayheader="<a href='".api_get_self()."?".api_get_cidreq()."&amp;view=list&amp;origin=$origin&amp;month=$month&amp;year=$year&amp;day=$curday#$curday'>".$curday."</a>";
-								$dayheader .= '<br /><b>'.substr($value['start_date'],11,8).'</b>';
+								$dayheader .= '<br /><i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'</i>';
 								$dayheader .= ' - ';
 								$dayheader .= $value['title'];
 							}
diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index f1c663e871..c713ca7c76 100644
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -132,9 +132,12 @@ function get_myagendaitems($courses_dbs, $month, $year)
 		$result = api_sql_query($sqlquery, __FILE__, __LINE__);
 		while ($item = Database::fetch_array($result))
 		{
+			
 			$agendaday = date("j",strtotime($item['start_date']));
 			if(!isset($items[$agendaday])){$items[$agendaday]=array();}
+			
 			$time= date("H:i",strtotime($item['start_date']));
+			$end_time= date("H:i",strtotime($item['end_date']));
 			$URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item
 			if ($setting_agenda_link == 'coursecode')
 			{
@@ -149,8 +152,9 @@ function get_myagendaitems($courses_dbs, $month, $year)
 			{
 				$items[$agendaday][$item['start_date']] = '';
 			}
-			$items[$agendaday][$item['start_date']] .= "<i>".$time."</i> <a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a>  ".Security::remove_XSS($item['title'])."<br />";
+				$items[$agendaday][$item['start_date']] .= "<i>".$time."</i>&nbsp;-&nbsp;<i>".$end_time."</i>&nbsp;<a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a>  ".Security::remove_XSS($item['title'])."<br />";
 		}
+		
 	}
 	// sorting by hour for every day
 	$agendaitems = array ();