diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 3d995c3ea0..682b98f546 100644
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -86,7 +86,7 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 
 
 int InsetLabel::latex(Buffer const &, odocstream & os,
-		      OutputParams const &) const
+                      OutputParams const &) const
 {
 	os << escape(getCommand());
 	return 0;
@@ -94,15 +94,16 @@ int InsetLabel::latex(Buffer const &, odocstream & os,
 
 
 int InsetLabel::plaintext(Buffer const &, odocstream & os,
-		      OutputParams const &) const
+                          OutputParams const &) const
 {
-	os << '<' << getParam("name") << '>';
-	return 0;
+	docstring str = getParam("name");
+	os << '<' << str << '>';
+	return 2 + str.size();
 }
 
 
 int InsetLabel::docbook(Buffer const & buf, odocstream & os,
-			OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
 	os << "<!-- anchor id=\""
            << sgml::cleanID(buf, runparams, getParam("name"))
diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index d5ed89d3c9..600d5ebda1 100644
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -68,20 +68,21 @@ void InsetOptArg::write(Buffer const & buf, ostream & os) const
 
 
 int InsetOptArg::latex(Buffer const &, odocstream &,
-		       OutputParams const &) const
-{
-	return 0;
-}
-
-int InsetOptArg::docbook(Buffer const &, odocstream &,
-		       OutputParams const &) const
+                       OutputParams const &) const
 {
 	return 0;
 }
 
 
 int InsetOptArg::plaintext(Buffer const &, odocstream &,
-		       OutputParams const &) const
+                           OutputParams const &) const
+{
+	return 0;
+}
+
+
+int InsetOptArg::docbook(Buffer const &, odocstream &,
+                         OutputParams const &) const
 {
 	return 0;
 }
diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 79c04a87d4..0c6e163a66 100644
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -36,14 +36,13 @@ public:
 
 	/// Standard LaTeX output -- short-circuited
 	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
-	/// Standard DocBook output -- short-circuited
-	int docbook(Buffer const &, odocstream &,
-		  OutputParams const &) const;
-
+	          OutputParams const &) const;
 	/// Standard plain text output -- short-circuited
 	int plaintext(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	              OutputParams const &) const;
+	/// Standard DocBook output -- short-circuited
+	int docbook(Buffer const &, odocstream &,
+	            OutputParams const &) const;
 
 	/// Outputting the optional parameter of a LaTeX command
 	int latexOptional(Buffer const &, odocstream &,
diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index e7fc211fe5..343133c0fe 100644
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -167,7 +167,7 @@ void InsetSpace::read(Buffer const &, LyXLex & lex)
 
 
 int InsetSpace::latex(Buffer const &, odocstream & os,
-		      OutputParams const & runparams) const
+                      OutputParams const & runparams) const
 {
 	switch (kind_) {
 	case NORMAL:
@@ -200,26 +200,15 @@ int InsetSpace::latex(Buffer const &, odocstream & os,
 
 
 int InsetSpace::plaintext(Buffer const &, odocstream & os,
-		      OutputParams const &) const
+                          OutputParams const &) const
 {
-	switch (kind_) {
-	case NORMAL:
-	case PROTECTED:
-	case THIN:
-	case QUAD:
-	case QQUAD:
-	case ENSPACE:
-	case ENSKIP:
-	case NEGTHIN:
-		os << ' ';
-		break;
-	}
-	return 0;
+	os << ' ';
+	return 1;
 }
 
 
 int InsetSpace::docbook(Buffer const &, odocstream & os,
-			OutputParams const &) const
+                        OutputParams const &) const
 {
 	switch (kind_) {
 	case NORMAL:
diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 414e6e4171..b8bd438301 100644
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -65,13 +65,13 @@ public:
 	void read(Buffer const &, LyXLex & lex);
 	///
 	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	          OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	              OutputParams const &) const;
 	///
 	int docbook(Buffer const &, odocstream &,
-		    OutputParams const &) const;
+	            OutputParams const &) const;
 	/// the string that is passed to the TOC
 	virtual int textString(Buffer const &, odocstream &,
 		OutputParams const &) const;