diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index d4a139537..9f8fc22be 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2087,7 +2087,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 				pb.paint();
 			}
 			//name
-			g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 5+ numwidth+ 10+prg_offset, ypos+ fheight, width- numwidth- 40- 15-prg_offset, nameAndDescription, color);
+			g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_SMALL + numwidth + OFFSET_INNER_MID + prg_offset, ypos + fheight, width - numwidth - 4*OFFSET_INNER_MID - 15 - prg_offset, nameAndDescription, color);
 		}
 		if (!firstpaint && curr == selected)
 			updateVfd();
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 87499697e..05fd0b093 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1285,8 +1285,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
 	bool first_start = true;
 	bool update_lcd = true;
 	int eof = 0;
+	int eof2 = 0;
+	int position_tmp = 0;
 	bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);;
 	keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
+
 	while (playstate >= CMoviePlayerGui::PLAY)
 	{
 		if (update_lcd) {
@@ -1320,6 +1323,20 @@ void CMoviePlayerGui::PlayFileLoop(void)
 				printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent);
 #endif
 				/* in case ffmpeg report incorrect values */
+				if((playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
+					if(position_tmp != position){
+						position_tmp = position ;
+						eof2 = 0;
+					}else{
+						if (++eof2 > 6) {
+							at_eof = true;
+							break;
+						}
+					}
+				}
+				else{
+					eof2 = 0;
+				}
 				int posdiff = duration - position;
 				if ((posdiff >= 0) && (posdiff < 2000) && timeshift == TSHIFT_MODE_OFF)
 				{
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index f54d04c30..145360ee8 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -1616,6 +1616,7 @@ int CTimerList::modifyTimer()
 		if (!strlen(timer->recordingDir))
 			strncpy(timer->recordingDir,g_settings.network_nfs_recordingdir.c_str(),sizeof(timer->recordingDir)-1);
 		timer_recordingDir = timer->recordingDir;
+		strncpy(t_old.recordingDir, timer->recordingDir, sizeof(t_old.recordingDir)-1);
 
 		bool recDirEnabled = (g_settings.recording_type == RECORDING_FILE); // obsolete?
 		CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, recDirEnabled, timer_recordingDir, this, "rec_dir1", CRCInput::RC_green);