diff --git a/src/ChangeLog b/src/ChangeLog
index fd48d4c9bc..8a37fe4e32 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,12 @@
+2005-05-01  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* text.C (leftMargin): Fix the parindent use bug (1764) 
+	by dirty trick
+
 2005-04-28  Michael Schmitt  <michael.schmitt@teststep.org>
 
-        * lyxlayout.C (Read): transform underscores to spaces in CopyStyle
-        argument. 
+	* lyxlayout.C (Read): transform underscores to spaces in CopyStyle
+	argument. 
 
 2005-04-25  Angus Leeming  <leeming@lyx.org>
 
diff --git a/src/text.C b/src/text.C
index 1753cea13f..12974e8e57 100644
--- a/src/text.C
+++ b/src/text.C
@@ -591,7 +591,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
 	    // in charstyles, tabulars and ert paragraphs are never indented!
-	    && (par.ownerCode() != InsetBase::TEXT_CODE
+	    && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText())
 	            && par.ownerCode() != InsetBase::ERT_CODE
 		    && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
 	    && (par.layout() != tclass.defaultLayout()