diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f55cca1319..c0f0a3927b 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-05  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* insetbox.[Ch]: fix bugs 2136, 2123
+
 2005-11-02  Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* insetbox.C (metrics): fix width problems (bug 2137)
diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 2e5571879a..9440fc5283 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -163,6 +163,12 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 }
 
 
+bool InsetBox::forceDefaultParagraphs(idx_type) const
+{
+	return !params_.inner_box;
+}
+
+
 bool InsetBox::showInsetDialog(BufferView * bv) const
 {
 	InsetBoxMailer(const_cast<InsetBox &>(*this)).showDialog(bv);
@@ -209,6 +215,13 @@ bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_INSET_DIALOG_UPDATE:
 		flag.enabled(true);
 		return true;
+	case LFUN_BREAKPARAGRAPH:
+		if (params_.inner_box) {
+			return InsetCollapsable::getStatus(cur, cmd, flag);
+		} else {
+			flag.enabled(false);
+			return true;
+		}
 
 	default:
 		return InsetCollapsable::getStatus(cur, cmd, flag);
diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index 80efa336d8..044f0d4330 100644
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -76,6 +76,10 @@ public:
 	///
 	bool display() const { return false; }
 	///
+	bool forceDefaultParagraphs(idx_type) const;
+	///
+	bool neverIndent() const { return true; }
+	///
 	int latex(Buffer const &, std::ostream &,
 			OutputParams const &) const;
 	///