diff --git a/src/RowList_fwd.h b/src/RowList_fwd.h
index 8f79e3e50f..a86fae5e53 100644
--- a/src/RowList_fwd.h
+++ b/src/RowList_fwd.h
@@ -12,10 +12,10 @@
 #ifndef ROW_LIST_FWD_H
 #define ROW_LIST_FWD_H
 
-#include <list>
+#include <vector>
 
 class Row;
 
-typedef std::list<Row> RowList;
+typedef std::vector<Row> RowList;
 
 #endif
diff --git a/src/text.C b/src/text.C
index 31eebcf5f2..f68d505238 100644
--- a/src/text.C
+++ b/src/text.C
@@ -364,11 +364,11 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
 		// row in this paragraph.
 		RowList::iterator rit = pit->rows.begin();
 		RowList::iterator end = pit->rows.end();
-		int minfill = rit->fill();
+#warning This is wrong.
+		int minfill = workWidth() / 2;
 		for ( ; rit != end; ++rit)
 			if (rit->fill() < minfill)
 				minfill = rit->fill();
-
 		x += font_metrics::signedWidth(layout->leftmargin,
 			tclass.defaultfont());
 		x += minfill;