diff --git a/ChangeLog b/ChangeLog
index 1b2a1993d3..9ee7fe29a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-04-10  Juergen Vigna  <jug@sad.it>
 
+	* src/BufferView2.C (showLockedInsetCursor): small bugfix for
+	misplaced cursor when inset in inset is locked.
+
+	* src/insets/insettext.C (LocalDispatch): small fix so that a
+	BREAKLINE is not inserted if we don't permit it with autBreakRows.
+
 	* src/insets/insetfoot.C (GetDrawFont): implemented this as the
 	footnote font should be decreased in size twice when displaying.
 
diff --git a/src/BufferView2.C b/src/BufferView2.C
index b4b46aa653..267d88a0aa 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -739,7 +739,8 @@ int BufferView::lockInset(UpdatableInset * inset)
 void BufferView::showLockedInsetCursor(long x, long y, int asc, int desc)
 {
 	if (the_locking_inset && available()) {
-		y += text->cursor.y;
+		y += text->cursor.y +
+		    the_locking_inset->InsetInInsetY();
 		pimpl_->screen->ShowManualCursor(x, y, asc, desc,
 					 LyXScreen::BAR_SHAPE);
 	}
diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 08da8ce5ab..4ec94b6721 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -693,6 +693,8 @@ InsetText::LocalDispatch(BufferView * bv,
 	return DISPATCHED;
     case LFUN_BREAKPARAGRAPH:
     case LFUN_BREAKLINE:
+	if (!autoBreakRows)
+	    return DISPATCHED;
 	bv->text->SetUndo(Undo::INSERT, 
 	    bv->text->cursor.par->ParFromPos(bv->text->cursor.pos)->previous,
 	    bv->text->cursor.par->ParFromPos(bv->text->cursor.pos)->next);