diff --git a/src/ChangeLog b/src/ChangeLog
index dc0b31d8de..4148a2d4df 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-15  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
+	* buffer.C: add compability for minipage alignment.
+	(latexParagraphs): remove unwanted pextra check.
+
 	* several files: remove CXX_WORKING_NAMESPACES
 
 	* buffer.C (pop_tag): tie is in namespace boost
diff --git a/src/buffer.C b/src/buffer.C
index 4e85329a02..ddd610b9c4 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -510,6 +510,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
 					// we do want to use some of these
 					// parameters to set options in the
 					// minipage inset.
+					InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
 					LyXParagraph * tmp = minipar;
 					while (tmp) {
 						tmp->params.pextraType(0);
@@ -522,6 +523,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
 					}
 					
 					InsetMinipage * mini = new InsetMinipage;
+					mini->pos(imp);
 					mini->inset->par = minipar;
 					// Insert the minipage last in the
 					// previous paragraph.
@@ -564,6 +566,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
 				// This is not quite correct yet since we
 				// do want to use some of these parameters
 				// to set options in the minipage inset.
+				InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
 				LyXParagraph * tmp = minipar;
 				while (tmp) {
 					tmp->params.pextraType(0);
@@ -576,6 +579,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
 				}
 				
 				InsetMinipage * mini = new InsetMinipage;
+				mini->pos(imp);
 				mini->inset->par = minipar;
 				par->previous()->InsertInset(par->previous()->size(), mini);
 				minipar = 0;
@@ -2309,7 +2313,10 @@ void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
 		// flag this with ftcount
 		ftcount = -1;
 		if (layout.isEnvironment()
-                    || par->params.pextraType() != LyXParagraph::PEXTRA_NONE) {
+#ifndef NEW_INSETS
+                    || par->params.pextraType() != LyXParagraph::PEXTRA_NONE
+#endif
+			) {
 			par = par->TeXEnvironment(this, params, ofs, texrow
 #ifndef NEW_INSETS
 						  ,ftnote, ft_texrow, ftcount
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 832a115191..513fa422fe 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-15  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
+	* insetminipage.h: change the order or Position to match
+	LyXParagraph::MINIPAGE_ALIGNMENT
+
 	* several files: remvoe CXX_WORKING_NAMESPACES
 
 	* ExternalTemplate.h: noncopyable is in namespace boost
diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index fa455acb33..c8a270dd45 100644
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -26,8 +26,8 @@ class InsetMinipage : public InsetCollapsable {
 public:
 	///
 	enum Position {
-		center,
 		top,
+		center,
 		bottom
 	};
 	///