diff --git a/org.adempiere.base/src/org/compiere/util/MimeType.java b/org.adempiere.base/src/org/compiere/util/MimeType.java
index c7f9dfc425..0f521fce30 100644
--- a/org.adempiere.base/src/org/compiere/util/MimeType.java
+++ b/org.adempiere.base/src/org/compiere/util/MimeType.java
@@ -218,6 +218,7 @@ public class MimeType
 		{ ".csh", "text/x-script.csh"},
 	//	{ ".css", "application/x-pointplus"}, 
 		{ ".css", "text/css"},
+		{ ".csv", MediaType.CSV_UTF_8.toString()},
 		{ ".cvs", "application/vnd.ms-excel"},
 		{ ".cxx", "text/plain"},
 		
diff --git a/org.idempiere.keikai/src/org/idempiere/keikai/view/CSVMediaView.java b/org.idempiere.keikai/src/org/idempiere/keikai/view/CSVMediaView.java
index 782d099394..8bcba9a62d 100644
--- a/org.idempiere.keikai/src/org/idempiere/keikai/view/CSVMediaView.java
+++ b/org.idempiere.keikai/src/org/idempiere/keikai/view/CSVMediaView.java
@@ -27,6 +27,8 @@ package org.idempiere.keikai.view;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.List;
 
 import org.idempiere.ui.zk.media.IMediaView;
@@ -83,7 +85,12 @@ public class CSVMediaView implements IMediaView {
 			Book book = importer.imports(bais, media.getName());
 			spreadsheet.setBook(book);
 			Sheet sheet = book.getSheetAt(0);
-			ICsvListReader csvListReader = new CsvListReader(media.getReaderData(), CsvPreference.STANDARD_PREFERENCE);
+			Reader reader;
+			if (media.isBinary())
+				reader = new InputStreamReader(new ByteArrayInputStream(media.getByteData()));
+			else
+				reader = media.getReaderData();
+			ICsvListReader csvListReader = new CsvListReader(reader, CsvPreference.STANDARD_PREFERENCE);
 			List<String> headers = csvListReader.read();
 			if (headers != null) {
 				for(int i = 0; i < headers.size(); i++) {