diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index f52d70af1d..1088bc57a9 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-18  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* math_nestinset.C (getStatus): disallow insertion of special char 
+	inset (bug 3590).
+
 2007-04-10  Enrico Forestieri  <forenr@tlc.unipr.it>
 
 	* math_biginset.C (draw): don't remove backslash delimiter.
diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 02be646fa0..38446f253c 100644
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -1012,6 +1012,15 @@ bool MathNestInset::getStatus(LCursor & cur, FuncRequest const & cmd,
 		flag.enabled(true);
 		break;
 
+	case LFUN_HYPHENATION:
+	case LFUN_LIGATURE_BREAK:
+	case LFUN_MENU_SEPARATOR:
+	case LFUN_LDOTS:
+	case LFUN_END_OF_SENTENCE:
+		// FIXME: These would probably make sense in math-text mode
+		flag.enabled(false);
+		break;
+
 	case LFUN_FRAK:
 		flag.enabled(currentMode() != TEXT_MODE);
 		break;
diff --git a/status.14x b/status.14x
index a70654f80c..012b3d7afb 100644
--- a/status.14x
+++ b/status.14x
@@ -45,7 +45,12 @@ What's new
 * USER INTERFACE:
 
 - fix bug where moving the last section up in the toc dialog eats the
-  last paragraph (bug 3303)
+  last paragraph (bug 3303).
+
+- fix crash when using "all-insets-toggle" lfun on a file with 
+  math insets (bug 3358).
+
+- fix crash when undoing ctrl-<minus> in mathed (bug 3590).
 
 - Handle undo correctly when inserting a plain text file (bug 3204).