diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 9f4e9e35d..0a44b8224 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -180,7 +180,7 @@ void CEpgData::processTextToArray(std::string text, int screening) // UTF-8
 
 			// check the wordwidth - add to this line if size ok
 			int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord, true);
-			if ((aktWordWidth+aktWidth)<(ox- 20- 15))
+			if ((aktWordWidth+aktWidth)<(ox - 20 - 15))
 			{//space ok, add
 				aktWidth += aktWordWidth;
 				aktLine += aktWord;
@@ -228,10 +228,10 @@ void CEpgData::showText( int startPos, int ypos )
 	int max_mon_w = 0, max_wday_w = 0;
 	int digi = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth("29..");
 	for(int i = 0; i < 12;i++){
-		max_mon_w = std::max(max_mon_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getMonth(i))) + ".", true)); // UTF-8
+		max_mon_w = std::max(max_mon_w, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getMonth(i))) + " ", true)); // UTF-8
 		if(i > 6)
-		      continue;
-		max_wday_w = std::max(max_wday_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getWeekday(i))) + ".", true)); // UTF-8
+			continue;
+		max_wday_w = std::max(max_wday_w, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getWeekday(i))) + " ", true)); // UTF-8
 	}
 	frameBuffer->paintBoxRel(sx, y, ox- 15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
 	for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight)
@@ -1101,7 +1101,6 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
 	std::string		screening_dates,screening_nodual;
 	int			count = 0;
 	int 			flag = 1;
-	char			tmpstr[256]={0};
 
 	screening_dates = screening_nodual = "";
 
@@ -1111,15 +1110,9 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
 		tmStartZeit = localtime(&(e->startTime));
 
 		screening_dates = g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit));
-		screening_dates += '.';
-
-		strftime(tmpstr, sizeof(tmpstr), " %d.", tmStartZeit );
-		screening_dates += tmpstr;
-
+		screening_dates += strftime(", %d", tmStartZeit);
 		screening_dates += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit));
-
-		strftime(tmpstr, sizeof(tmpstr), ". %H:%M", tmStartZeit );
-		screening_dates += tmpstr;
+		screening_dates += strftime(", %R", tmStartZeit);
 		if (e->startTime <= tmp_curent_zeit)
 			flag = 2;
 		else
@@ -1127,6 +1120,7 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
 
 		if (screening_dates != screening_nodual) {
 			screening_nodual=screening_dates;
+
 			processTextToArray(screening_dates, flag ); // UTF-8
 		}
 	}
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 7d6b507b1..282ed702a 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -49,7 +49,7 @@
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 
-
+#include <system/helpers.h>
 #include <zapit/client/zapittools.h>
 #include <zapit/zapit.h>
 #include <daemonc/remotecontrol.h>
@@ -747,18 +747,12 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
 			char tmpstr[256];
 			struct tm *tmStartZeit = localtime(&evtlist[curpos].startTime);
 
-
 			datetime1_str = g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit));
+			datetime1_str += strftime(", %H:%M", tmStartZeit);
+			datetime1_str += strftime(", %d", tmStartZeit);
+			datetime1_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit));
 
-			strftime(tmpstr, sizeof(tmpstr), ". %H:%M, ", tmStartZeit );
-			datetime1_str += tmpstr;
-
-			strftime(tmpstr, sizeof(tmpstr), " %d. ", tmStartZeit );
-			datetime2_str = tmpstr;
-
-			datetime2_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit));
-
-			datetime2_str += '.';
+			//datetime2_str += '.';
 
 			if ( m_showChannel ) // show the channel if we made a event search only (which could be made through all channels ).
 			{
@@ -772,8 +766,11 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
 		}
 
 		// 1st line
-		g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5,         ypos+ fheight1+3, fwidth1+5,            datetime1_str, color, 0, true); // UTF-8
-		g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1, ypos+ fheight1+3, width-fwidth1-10- 20, datetime2_str, color, 0, true); // UTF-8
+		int fwidth1a=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime1_str);
+		//int fwidth1b=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime2_str);
+
+		g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5,          ypos+ fheight1+3, fwidth1a, datetime1_str, color, 0, true); // UTF-8
+		//g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1a/2, ypos+ fheight1+3, fwidth1b, datetime2_str, color, 0, true); // UTF-8
 
 		int seit = ( evtlist[curpos].startTime - time(NULL) ) / 60;
 		if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) )