diff --git a/data/skin.xml b/data/skin.xml
index 1592330..8531ca7 100755
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -71,7 +71,7 @@
 	</fonts>
 	<!-- Subtitle effects -->
 	<subtitles>
-		<sub name="Subtitle_TTX" font="Regular;30" shadowColor="#40101010" shadowOffset="3,3" />
+		<sub name="Subtitle_TTX" font="Regular;30" shadowColor="#40101010" shadowOffset="3,3" lineHeight="36" />
 		<sub name="Subtitle_Regular" font="Regular;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" />
 		<sub name="Subtitle_Bold" font="Replacement;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" />
 		<sub name="Subtitle_Italic" font="Regular;30" foregroundColor="#DCAAAA" shadowColor="#40101010" shadowOffset="3,3" />
diff --git a/lib/dvb/teletext.cpp b/lib/dvb/teletext.cpp
index 381d337..c681427 100644
--- a/lib/dvb/teletext.cpp
+++ b/lib/dvb/teletext.cpp
@@ -666,19 +666,26 @@ void eDVBTeletextParser::addSubtitleString(int color, std::string string)
 
 //	eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color);
 	gRGB rgbcol((color & 1) ? 255 : 128, (color & 2) ? 255 : 128, (color & 4) ? 255 : 128);
-	if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty()))
+	if ((color != m_subtitle_color || force_cell) && (!m_subtitle_line1.empty() || !m_subtitle_line2.empty()) && (color == -2))
 	{
 //		eDebug("add text |%s|: %d != %d || %d", m_subtitle_text.c_str(), color, m_subtitle_color, force_cell);
-		m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_text));
-		m_subtitle_text = "";
-	} else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ')
-		m_subtitle_text += " ";
+		m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_line1, m_subtitle_line2));
+		m_subtitle_line1 = "";
+		m_subtitle_line2 = "";
+	}
 	
 	if (!string.empty())
 	{
 //		eDebug("set %d as new color", color);
 		m_subtitle_color = color;
-		m_subtitle_text += string;
+		if (m_subtitle_line1.empty())
+		{
+			m_subtitle_line1 = string;
+		}
+		else
+		{
+			m_subtitle_line2 = string;
+		}
 	}
 }
 
@@ -687,7 +694,7 @@ void eDVBTeletextParser::sendSubtitlePage()
 //	eDebug("subtitle page:");
 	bool send=m_C & (1<<4);
 	for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
-		if (!m_subtitle_page.m_elements[i].m_text.empty())
+		if (!m_subtitle_page.m_elements[i].m_line1.empty() || !m_subtitle_page.m_elements[i].m_line2.empty())
 			send=true;
 	if (send)
 		m_new_subtitle_page(m_subtitle_page);
diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index 880fa56..e1a8ea8 100644
--- a/lib/dvb/teletext.h
+++ b/lib/dvb/teletext.h
@@ -11,10 +11,11 @@
 struct eDVBTeletextSubtitlePageElement
 {
 	gRGB m_color;
-	std::string m_text;
+	std::string m_line1;
+	std::string m_line2;
 	eRect m_area;
-	eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
-		: m_color(color), m_text(text)
+	eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &line1, const std::string &line2)
+		: m_color(color), m_line1(line1), m_line2(line2)
 	{
 	}
 };
@@ -57,7 +58,8 @@ private:
 	void handleLine(unsigned char *line, int len);
 	void handlePageEnd(int have_pts, const pts_t &pts);
 	
-	std::string m_subtitle_text;
+	std::string m_subtitle_line1;
+	std::string m_subtitle_line2;
 	int m_subtitle_color;
 	
 	void addSubtitleString(int color, std::string string);
diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index f3d0e35..f89a9fd 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -142,6 +142,7 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		} else if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
+			bool didMove = false;
 			painter.setFont(subtitleStyles[Subtitle_TTX].font);
 			for (int i=0; i<elements; ++i)
 			{
@@ -149,13 +150,39 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				eRect &area = element.m_area;
 				eRect shadow = area;
 				shadow.moveBy(subtitleStyles[Subtitle_TTX].shadow_offset);
-				painter.setForegroundColor(subtitleStyles[Subtitle_TTX].shadow_color);
-				painter.renderText(shadow, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
-				if ( !subtitleStyles[Subtitle_TTX].have_foreground_color )
-					painter.setForegroundColor(element.m_color);
-				else
-					painter.setForegroundColor(subtitleStyles[Subtitle_TTX].foreground_color);
-				painter.renderText(area, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+
+				if (!element.m_line1.empty()) // Subtitle line 1
+				{
+					painter.setForegroundColor(subtitleStyles[Subtitle_TTX].shadow_color);
+					painter.renderText(shadow, element.m_line1, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					if (!subtitleStyles[Subtitle_TTX].have_foreground_color )
+						painter.setForegroundColor(element.m_color);
+					else
+						painter.setForegroundColor(subtitleStyles[Subtitle_TTX].foreground_color);
+					painter.renderText(area, element.m_line1, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					area.moveBy(0, subtitleStyles[Subtitle_TTX].line_height); // Prepare for next line by moving area one line down
+					shadow.moveBy(0, subtitleStyles[Subtitle_TTX].line_height); // Prepare for next line by moving shadow one line down
+					didMove = true;
+				}
+
+				if (!element.m_line2.empty()) // Subtitle line 2
+				{
+					painter.setForegroundColor(subtitleStyles[Subtitle_TTX].shadow_color);
+					painter.renderText(shadow, element.m_line2, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+					if (!subtitleStyles[Subtitle_TTX].have_foreground_color )
+						painter.setForegroundColor(element.m_color);
+					else
+						painter.setForegroundColor(subtitleStyles[Subtitle_TTX].foreground_color);
+					painter.renderText(area, element.m_line2, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+				}
+
+				if (didMove)
+				{
+					// Must move area and shadow back, otherwise text will jump one line down if showing and hiding infobar before the next subtitle page arrives
+					shadow.moveBy(0, -1*subtitleStyles[Subtitle_TTX].line_height);
+					area.moveBy(0, -1*subtitleStyles[Subtitle_TTX].line_height);
+					didMove = false;
+				}
 			}
 		}
 		else if (m_pango_page_ok)
@@ -215,12 +242,13 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 	}
 }
 
-void eSubtitleWidget::setFontStyle(subfont_t face, gFont *font, int haveColor, const gRGB &col, const gRGB &shadowCol, const ePoint &shadowOffset)
+void eSubtitleWidget::setFontStyle(subfont_t face, gFont *font, int haveColor, const gRGB &col, const gRGB &shadowCol, const ePoint &shadowOffset, int lineHeight)
 {
 	subtitleStyles[face].font = font;
 	subtitleStyles[face].have_foreground_color = haveColor;
 	subtitleStyles[face].foreground_color = col;
 	subtitleStyles[face].shadow_color = shadowCol;
 	subtitleStyles[face].shadow_offset = shadowOffset;
+	subtitleStyles[face].line_height = lineHeight;
 }
 
diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index 45345db..0fc1960 100644
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -48,13 +48,13 @@ public:
 	struct eSubtitleStyle
 	{
 		subfont_t face;
-		int have_foreground_color, have_shadow_color;
+		int have_foreground_color, have_shadow_color, line_height;
 		gRGB foreground_color, shadow_color;
 		ePoint shadow_offset;
 		ePtr<gFont> font;
 	};
 
-	static void setFontStyle(subfont_t face, gFont *font, int autoColor, const gRGB &col, const gRGB &shadowCol, const ePoint &shadowOffset);
+	static void setFontStyle(subfont_t face, gFont *font, int autoColor, const gRGB &col, const gRGB &shadowCol, const ePoint &shadowOffset, int lineHeight);
 
 protected:
 	int event(int event, void *data=0, void *data2=0);
diff --git a/skin.py b/skin.py
index 5fcaa11..8973fe0 100644
--- a/skin.py
+++ b/skin.py
@@ -337,7 +337,12 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 				shadowColor = gRGB(0)
 			shadowOffset = parsePosition(get_attr("shadowOffset"), scale)
 			face = eSubtitleWidget.__dict__[get_attr("name")]
-			eSubtitleWidget.setFontStyle(face, font, haveColor, foregroundColor, shadowColor, shadowOffset)
+			lineHeight = get_attr("lineHeight")
+			if lineHeight:
+				lineHeight = int(lineHeight)
+			else:
+				lineHeight = 0
+			eSubtitleWidget.setFontStyle(face, font, haveColor, foregroundColor, shadowColor, shadowOffset, lineHeight)
 
 	for windowstyle in skin.findall("windowstyle"):
 		style = eWindowStyleSkinned()