diff -urN lyx-1.2.0/src/buffer.C wlyx-1.2.0/src/buffer.C
--- lyx-1.2.0/src/buffer.C	2002-05-21 15:10:24.000000000 +0200
+++ wlyx-1.2.0/src/buffer.C	2002-06-24 17:59:52.000000000 +0200
@@ -2358,6 +2358,23 @@
 				break;
 			}
 		}
+			// (Claus Hentschel)
+			// LyX hasn't control over margins when package
+			// 'geometry' is used but package 'a4' isn't
+			// set to be used!
+		else if (params.use_geometry) {
+			switch (params.papersize) {
+			case BufferParams::PAPER_A4PAPER:
+				ofs << "\\usepackage{a4}\n";
+				texrow.newline();
+				break;
+			default:
+				if(lyxrc.default_papersize == BufferParams::PAPER_A4PAPER) {
+					ofs << "\\usepackage{a4}\n";
+					texrow.newline();
+				}
+			}
+		}
 		if (params.use_geometry) {
 			ofs << "\\usepackage{geometry}\n";
 			texrow.newline();