diff --git a/po/POTFILES.in b/po/POTFILES.in
index d0c3a8bdd9..f7ce0b3646 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -198,9 +198,6 @@ src/MenuBackend.C
 src/minibuffer.C
 src/paragraph.C
 src/support/filetools.C
-src/support/getUserName.C
-src/support/path.C
-src/support/path.h
 src/tabular.C
 src/text2.C
 src/text.C
diff --git a/src/ChangeLog b/src/ChangeLog
index 16e6fa9cea..7832e299aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-30  Herbert Voss  <voss@lyx.org>
+
+	* buffer.C (parseSingleLyXformat2Token): fix bug with ignored
+	"keep" option
+
 2002-05-31  John Levon  <moz@compsoc.man.ac.uk>
 
 	* lyxvc.C: fix bug 416 (make sure buffer is saved before
diff --git a/src/buffer.C b/src/buffer.C
index 481ca4990a..afb5d022c0 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1180,15 +1180,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	} else if (token == "\\added_space_top") {
 		lex.nextToken();
 		VSpace value = VSpace(lex.getString());
+		// only add the length when value > 0 or
+		// with option keep
 		if ((value.length().len().value() != 0) ||
+		    value.keep() ||
 		    (value.kind() != VSpace::LENGTH))
-		    par->params().spaceTop(value);
+			par->params().spaceTop(value);
 	} else if (token == "\\added_space_bottom") {
 		lex.nextToken();
 		VSpace value = VSpace(lex.getString());
+		// only add the length when value > 0 or
+		// with option keep
 		if ((value.length().len().value() != 0) ||
+                   value.keep() ||
 		    (value.kind() != VSpace::LENGTH))
-		    par->params().spaceBottom(value);
+			par->params().spaceBottom(value);
 #ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 	} else if (token == "\\pextra_type") {
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 279584d2c9..6aa1383258 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-31  Juergen Vigna  <jug@sad.it>
+
+	* insetert.C (get_new_label): add '...' for multi-paragraph ert
+	insets too
+	(update) new method
+
 2002-05-30  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* insetexternal.C (clone): fix () bug when using new
diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index a7f743cf34..7bd9562879 100644
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -492,7 +492,7 @@ string const InsetERT::get_new_label() const
 		la += inset.paragraph()->getChar(j);
 		++i;
 	}
-	if (i > 0 && j < p_siz) {
+	if (inset.paragraph()->next() || (i > 0 && j < p_siz)) {
 		la += "...";
 	}
 	if (la.empty()) {
@@ -709,3 +709,15 @@ int InsetERT::getMaxWidth(BufferView * bv, UpdatableInset const * in) const
 		return -1;
 	return w;
 }
+
+
+void InsetERT::update(BufferView * bv, LyXFont const & font,
+                      bool reinit)
+{
+	if (inset.need_update & InsetText::INIT ||
+		inset.need_update & InsetText::FULL)
+	{
+		setButtonLabel();
+	}
+	InsetCollapsable::update(bv, font, reinit);
+}
diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 7e169a2796..8aaf1310cc 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -135,6 +135,8 @@ public:
 	}
 	///
 	int getMaxWidth(BufferView *, UpdatableInset const *) const;
+	///
+	void update(BufferView *, LyXFont const &, bool =false);
 
 private:
 	///