Index: lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
===================================================================
diff -u -r7eec5c174998730130370a7a8e2c67cb3c10cee8 -ra183d55bcecf4462ec62c85e40772831bcd4f763
--- lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java	(.../ExcelUtil.java)	(revision 7eec5c174998730130370a7a8e2c67cb3c10cee8)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java	(.../ExcelUtil.java)	(revision a183d55bcecf4462ec62c85e40772831bcd4f763)
@@ -140,6 +140,8 @@
 	}
 
 	if (data != null) {
+	    int maxColumnSize = 0;
+	    
 	    // Print data
 	    for (int rowIndex = 0; rowIndex < data.length; rowIndex++) {
 
@@ -148,12 +150,25 @@
 
 		Row row = sheet.createRow(rowIndex + rowIndexOffset);
 
-		for (int columnIndex = 0; columnIndex < data[rowIndex].length; columnIndex++) {
+		int columnSize = data[rowIndex].length;
+		for (int columnIndex = 0; columnIndex < columnSize; columnIndex++) {
 		    ExcelCell excelCell = data[rowIndex][columnIndex];
 		    createCell(excelCell, columnIndex, row);
 		}
+		
+		//calculate max column size
+		if (columnSize > maxColumnSize) {
+		    maxColumnSize = columnSize;
+		}
 	    }
+	    
+	    //autoSizeColumns
+	    for (int i=0; i < maxColumnSize; i++) {
+		sheet.autoSizeColumn(i);
+	    }
+	    
 	}
+	
     }
 
     public static void createCell(ExcelCell excelCell, int cellnum, Row row) {