diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index 03aa357462..bd3b914e21 100644
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -202,8 +202,7 @@ public:
 	virtual int docbook(Buffer const &, odocstream & os,
 		OutputParams const &) const;
 	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, odocstream &,
-		OutputParams const &) const { return 0; };
+	virtual void textString(Buffer const &, odocstream &) const {}
 
 	/** This enum indicates by which means the inset can be modified:
 	- NOT_EDITABLE: the inset's content cannot be modified at all
diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 3778ffda97..4c6472dcbc 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -332,10 +332,9 @@ int InsetCharStyle::plaintext(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetCharStyle::textString(Buffer const & buf, odocstream & os,
-		       OutputParams const & op) const
+void InsetCharStyle::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	os << paragraphs().begin()->asString(buf, true);
 }
 
 
diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index 34b910472f..39231e9a57 100644
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -85,8 +85,7 @@ public:
 	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, odocstream &,
-		OutputParams const &) const;
+	virtual void textString(Buffer const &, odocstream &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 
diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index ffbf0c4381..eb7c87e454 100644
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -328,10 +328,10 @@ int InsetQuotes::latex(Buffer const &, odocstream & os,
 }
 
 
-int InsetQuotes::plaintext(Buffer const &, odocstream & os,
-		       OutputParams const &) const
+int InsetQuotes::plaintext(Buffer const & buf, odocstream & os,
+			   OutputParams const &) const
 {
-	os << '"';
+	os << dispString(buf.params().language);
 	return 0;
 }
 
@@ -354,10 +354,9 @@ int InsetQuotes::docbook(Buffer const &, odocstream & os,
 }
 
 
-int InsetQuotes::textString(Buffer const & buf, odocstream & os,
-		       OutputParams const & op) const
+void InsetQuotes::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	os << dispString(buf.params().language);
 }
 
 
diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index 33a62e2f5c..cbd2f5dcbf 100644
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -93,8 +93,7 @@ public:
 	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 
 	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, odocstream &,
-		OutputParams const &) const;
+	virtual void textString(Buffer const &, odocstream &) const;
 
 	///
 	void validate(LaTeXFeatures &) const;
diff --git a/src/mathed/InsetMathHull.C b/src/mathed/InsetMathHull.C
index b9c2b241fb..dc6391c595 100644
--- a/src/mathed/InsetMathHull.C
+++ b/src/mathed/InsetMathHull.C
@@ -1508,10 +1508,9 @@ int InsetMathHull::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetMathHull::textString(Buffer const & buf, odocstream & os,
-		       OutputParams const & op) const
+void InsetMathHull::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	plaintext(buf, os, OutputParams());
 }
 
 
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 1df5ce128b..daef652c25 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -109,8 +109,7 @@ public:
 	int docbook(Buffer const &, odocstream &,
 		    OutputParams const &) const;
 	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, odocstream &,
-		OutputParams const &) const;
+	virtual void textString(Buffer const &, odocstream &) const;
 
 	/// get notification when the cursor leaves this inset
 	bool notifyCursorLeaves(LCursor & cur);
diff --git a/src/paragraph.C b/src/paragraph.C
index 8c3631eca7..00dbb27ff9 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1400,38 +1400,7 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const
 // Used for building the table of contents
 docstring const Paragraph::asString(Buffer const & buffer, bool label) const
 {
-	OutputParams runparams;
-	return asString(buffer, runparams, label);
-}
-
-
-docstring const Paragraph::asString(Buffer const & buffer,
-				 OutputParams const & runparams,
-				 bool label) const
-{
-#if 0
-	string s;
-	if (label && !params().labelString().empty())
-		s += params().labelString() + ' ';
-
-	for (pos_type i = 0; i < size(); ++i) {
-		value_type c = getChar(i);
-		if (isPrintable(c))
-			s += c;
-		else if (c == META_INSET &&
-			 getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
-			ostringstream os;
-			getInset(i)->plaintext(buffer, os, runparams);
-			s += subst(STRCONV(os.str()),'\n',' ');
-		}
-	}
-
-	return s;
-#else
-	// This should really be done by the caller and not here.
-	docstring ret = asString(buffer, runparams, 0, size(), label);
-	return subst(ret, '\n', ' ');
-#endif
+	return asString(buffer, 0, size(), label);
 }
 
 
@@ -1439,16 +1408,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
 				 pos_type beg, pos_type end, bool label) const
 {
 
-	OutputParams const runparams;
-	return asString(buffer, runparams, beg, end, label);
-}
-
-
-docstring const Paragraph::asString(Buffer const & buffer,
-				 OutputParams const & runparams,
-				 pos_type beg, pos_type end, bool label) const
-{
-	lyx::odocstringstream os;
+	odocstringstream os;
 
 	if (beg == 0 && label && !params().labelString().empty())
 		os << params().labelString() << ' ';
@@ -1458,7 +1418,7 @@ docstring const Paragraph::asString(Buffer const & buffer,
 		if (isPrintable(c))
 			os.put(c);
 		else if (c == META_INSET)
-			getInset(i)->textString(buffer, os, runparams);
+			getInset(i)->textString(buffer, os);
 	}
 
 	return os.str();
diff --git a/src/paragraph.h b/src/paragraph.h
index a2f43d5e56..9dd4686716 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -100,10 +100,6 @@ public:
 	///
 	bool isMultiLingual(BufferParams const &) const;
 
-	///
-	docstring const asString(Buffer const &,
-				   OutputParams const & runparams,
-				   bool label) const;
 	///
 	docstring const asString(Buffer const &, bool label) const;
 	///
@@ -111,12 +107,6 @@ public:
 				   pos_type beg,
 				   pos_type end,
 				   bool label) const;
-	///
-	docstring const asString(Buffer const &,
-				   OutputParams const & runparams,
-				   pos_type beg,
-				   pos_type end,
-				   bool label) const;
 
 	///
 	void write(Buffer const &, std::ostream &, BufferParams const &,