diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index ef5d6fc5c0..a448bfce49 100644
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -72,13 +72,16 @@ bbb.presentation.pages = {0} of {1}
 bbb.presentation.uploadcomplete = Upload completed. Please wait while we convert the document.
 bbb.presentation.uploadsuccessful = Upload successful.
 bbb.presentation.uploaded = uploaded.
-bbb.presentation.error.io = IO Error When Uploading File. Please Contact The Administrator.
-bbb.presentation.error.security = Security Error When Uploading File. Please Contact The Administrator.
-bbb.presentation.error.convert.format = Error While Detecting Uploaded File Format : please check that the uploaded file have a valid extension.
-bbb.presentation.error.convert.notsupported = Error The Uploaded File Format Is Not Supported : please upload a compatible file.
-bbb.presentation.error.convert.soffice = Error When Converting Uploaded File : please check that OpenOffice is installed and its service is running on the server.
-bbb.presentation.error.convert.nbpage = Error While Counting Page Number Of Uploaded File. Please Contact The Administrator.
-bbb.presentation.error.convert.maxnbpagereach = The Uploaded File Have Too Many Slides/Pages (> 100) And Is Not Allowed : please upload a smaller file.
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
+bbb.presentation.error.io = IO Error: Please contact administrator.
+bbb.presentation.error.security = Security Error: Please contact administrator.
+bbb.presentation.error.convert.format = Error: Please check that the uploaded file have a valid extension.
+bbb.presentation.error.convert.notsupported = Error: The uploaded document is unsupported. Please upload a compatible file.
+bbb.presentation.error.convert.soffice = Error: Failed to convert the uploaded document.
+bbb.presentation.error.convert.nbpage = Error: Failed to determine the number of pages in the uploaded document.
+bbb.presentation.error.convert.maxnbpagereach = Error: The uploaded document has too many pages.
 bbb.presentation.error.convert.swf = Error When Converting Uploaded File. Please Contact The Administrator.
 bbb.presentation.error.convert.swfimage = Error When Converting Image To Swf : please check that your image isn't corrupted or in a JPG/PNG Format.
 bbb.presentation.error.convert.swfpdf = Error When Converting PDF To Swf : please check that your PDF File isn't corrupted.
diff --git a/bigbluebutton-client/locale/es_ES/bbbResources.properties b/bigbluebutton-client/locale/es_ES/bbbResources.properties
index 8dd3df46bb..d7f494f1f9 100755
--- a/bigbluebutton-client/locale/es_ES/bbbResources.properties
+++ b/bigbluebutton-client/locale/es_ES/bbbResources.properties
@@ -72,6 +72,9 @@ bbb.presentation.pages = {0} de {1}
 bbb.presentation.uploadcomplete = Subida completada. Por favor espere mientras convertimos el documento.
 bbb.presentation.uploadsuccessful = Subida con éxito
 bbb.presentation.uploaded = subido.
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
 bbb.presentation.error.io = Error IO subiendo el fichero. Por favor, contacte con el Administrador.
 bbb.presentation.error.security = Error de Seguridad subiendo el fichero. Por favor, contacte con el Administrador.
 bbb.presentation.error.convert.format = Error mientras se detectaba el formato de fichero : por favor, comprueba que el fichero que subes tiene una extensión válida.
diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
index 89649cc672..65841dcca1 100755
--- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties
+++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties
@@ -72,6 +72,9 @@ bbb.presentation.pages = {0} sur {1}
 bbb.presentation.uploadcomplete = Envoi du fichier terminé. Merci de patienter pendant la convertion du fichier.
 bbb.presentation.uploadsuccessful = Envoi réussi.
 bbb.presentation.uploaded = envoyé.
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
 bbb.presentation.error.io = Erreur serveur lors de l'envoi du fichier. Contactez l'administrateur.
 bbb.presentation.error.security = Erreur de sécurité lors de l'envoi du fichier. Contactez l'administrateur.
 bbb.presentation.error.convert.format = Erreur lors de la détection du format de fichier envoyé. Le fichier a-t-il bien une extension valide ?
diff --git a/bigbluebutton-client/locale/nl_NL/bbbResources.properties b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
index 1c4f4d3493..231933a68d 100755
--- a/bigbluebutton-client/locale/nl_NL/bbbResources.properties
+++ b/bigbluebutton-client/locale/nl_NL/bbbResources.properties
@@ -68,6 +68,9 @@ bbb.presentation.pages = {0} van {1}
 bbb.presentation.uploadcomplete = Upload gelukt. Wacht even terwijl we het document converteren.
 bbb.presentation.uploadsuccessful = Upload gelukt.
 bbb.presentation.uploaded = verstuurd.
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
 bbb.presentation.error.io = IO Error When Uploading File. Please Contact The Administrator.
 bbb.presentation.error.security = Security Error When Uploading File. Please Contact The Administrator.
 bbb.presentation.error.convert.format = Error While Detecting Uploaded File Format : please check that the uploaded file have a valid extension.
diff --git a/bigbluebutton-client/locale/vi_VN/bbbResources.properties b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
index 57c29a3fce..e7351cef8c 100755
--- a/bigbluebutton-client/locale/vi_VN/bbbResources.properties
+++ b/bigbluebutton-client/locale/vi_VN/bbbResources.properties
@@ -72,6 +72,9 @@ bbb.presentation.pages = {0} trên {1}
 bbb.presentation.uploadcomplete = Đã tải lên xong. Hãy đợi trong khi chuyển định dạng tài liệu.
 bbb.presentation.uploadsuccessful = Tải lên thành công.
 bbb.presentation.uploaded = tải lên xong.
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
 bbb.presentation.error.io = Lỗi truy xuất IO Error khi tải tệp lên. Hãy liên hệ với Người quản trị.
 bbb.presentation.error.security = Lỗi Bảo mật khi tải tệp lên. Hãy liên hệ với Người quản trị..
 bbb.presentation.error.convert.format = Lỗi nhận dạng định dạng tài liệu: Hãy kiểm tra tài liệu đúng định dạng.
diff --git a/bigbluebutton-client/locale/zh_CN/bbbResources.properties b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
index 480569ba79..ae8aea8515 100644
--- a/bigbluebutton-client/locale/zh_CN/bbbResources.properties
+++ b/bigbluebutton-client/locale/zh_CN/bbbResources.properties
@@ -59,6 +59,9 @@ bbb.presentation.forwardBtn.toolTip = 下一张
 bbb.presentation.resetZoomBtn.toolTip = 重置
 bbb.presentation.presenterNameLbl = 当前演示者为 {0}
 bbb.presentation.clickToUpload = Click to upload presentation
+bbb.presentation.document.supported = The uploaded document is supported.
+bbb.presentation.document.converted = Successfully converter the office document.
+bbb.presentation.error.document.convert.failed = Error: Failed to convert the office document.
 
 # FileUploadWindow.mxml
 bbb.fileupload.title = 上传幻灯片
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentSOService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentSOService.as
index 8c69d32f97..4ec286055b 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentSOService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentSOService.as
@@ -48,7 +48,7 @@ package org.bigbluebutton.modules.present.business {
     	private static const SUPPORTED_DOCUMENT_KEY:String = "SUPPORTED_DOCUMENT";
     	private static const UNSUPPORTED_DOCUMENT_KEY:String = "UNSUPPORTED_DOCUMENT";
     	private static const PAGE_COUNT_FAILED_KEY:String = "PAGE_COUNT_FAILED";
-    	private static const PAGE_COUNT_EXCEEDED_KEY:String = "PAGE_COUNT_EXCEEDED";	
+    	private static const PAGE_COUNT_EXCEEDED_KEY:String = "PAGE_COUNT_EXCEEDED";    	
     	private static const GENERATED_SLIDE_KEY:String = "GENERATED_SLIDE";
     	private static const GENERATING_THUMBNAIL_KEY:String = "GENERATING_THUMBNAIL";
     	private static const GENERATED_THUMBNAIL_KEY:String = "GENERATED_THUMBNAIL";
@@ -446,8 +446,7 @@ package org.bigbluebutton.modules.present.business {
 				code:String, presentationName:String, messageKey:String, numberOfPages:Number, 
 				maxNumberOfPages:Number) : void {
 			LogUtil.debug("pageCountExceededUpdateMessageCallback:Received update message " + messageKey);
-			var uploadEvent:UploadEvent = new UploadEvent(UploadEvent.CONVERT_ERROR);
-			uploadEvent.data = ResourceUtil.getInstance().getString('bbb.presentation.error.convert.maxnbpagereach')
+			var uploadEvent = new UploadEvent(UploadEvent.PAGE_COUNT_EXCEEDED);
 			dispatcher.dispatchEvent(uploadEvent);
 		}
 
@@ -471,7 +470,7 @@ package org.bigbluebutton.modules.present.business {
 		}
 				
 		public function conversionUpdateMessageCallback(conference:String, room:String, 
-				code:String, presentationName:String, messageKey:String) : void {
+			code:String, presentationName:String, messageKey:String) : void {
 			LogUtil.debug("conversionUpdateMessageCallback:Received update message " + messageKey);
 			var totalSlides : Number;
 			var completedSlides : Number;
@@ -480,22 +479,33 @@ package org.bigbluebutton.modules.present.business {
 			
 			switch (messageKey) {
 				case OFFICE_DOC_CONVERSION_SUCCESS_KEY :
+					uploadEvent = new UploadEvent(UploadEvent.OFFICE_DOC_CONVERSION_SUCCESS);
+					dispatcher.dispatchEvent(uploadEvent);
 					break;
 				case OFFICE_DOC_CONVERSION_FAILED_KEY :
+					uploadEvent = new UploadEvent(UploadEvent.OFFICE_DOC_CONVERSION_FAILED);
+					dispatcher.dispatchEvent(uploadEvent);
 					break;
 				case SUPPORTED_DOCUMENT_KEY :
+					uploadEvent = new UploadEvent(UploadEvent.SUPPORTED_DOCUMENT);
+					dispatcher.dispatchEvent(uploadEvent);
 					break;
 				case UNSUPPORTED_DOCUMENT_KEY :
-					uploadEvent = new UploadEvent(UploadEvent.CONVERT_ERROR);
-					uploadEvent.data = ResourceUtil.getInstance().getString('bbb.presentation.error.convert.format')
+					uploadEvent = new UploadEvent(UploadEvent.UNSUPPORTED_DOCUMENT);
 					dispatcher.dispatchEvent(uploadEvent);
 					break;
 				case GENERATING_THUMBNAIL_KEY :	
 					dispatcher.dispatchEvent(new UploadEvent(UploadEvent.THUMBNAILS_UPDATE));
-					break;			
+					break;		
 				case PAGE_COUNT_FAILED_KEY :
-					break;
+					uploadEvent = new UploadEvent(UploadEvent.PAGE_COUNT_FAILED);
+					dispatcher.dispatchEvent(uploadEvent);
+					break;	
 				case GENERATED_THUMBNAIL_KEY :
+					LogUtil.warn("conversionUpdateMessageCallback:GENERATED_THUMBNAIL_KEY " + messageKey);
+					break;
+				default:
+					LogUtil.warn("conversionUpdateMessageCallback:Unknown message " + messageKey);
 					break;
 			}														
 		}	
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/UploadEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/UploadEvent.as
index 747ad22d62..cba1af8287 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/UploadEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/events/UploadEvent.as
@@ -22,8 +22,7 @@ package org.bigbluebutton.modules.present.events
 	import flash.events.Event;
 	import flash.net.FileReference;
 	
-	public class UploadEvent extends Event
-	{
+	public class UploadEvent extends Event {
 		public static const OPEN_UPLOAD_WINDOW:String = "OPEN_UPLOAD_WINDOW";
 		public static const CLOSE_UPLOAD_WINDOW:String = "CLOSE_UPLOAD_WINDOW";
 		public static const CLEAR_PRESENTATION:String = "CLEAR_PRESENTATION";
@@ -38,7 +37,14 @@ package org.bigbluebutton.modules.present.events
 		public static const UPDATE_PROGRESS:String = "UPDATE_PROGRESS";
 		public static const THUMBNAILS_UPDATE:String = "THUMBNAILS_UPDATE";
 		public static const PRESENTATION_READY:String = "PRESENTATION_READY";
-		
+
+		public static const OFFICE_DOC_CONVERSION_SUCCESS:String = "OFFICE_DOC_CONVERSION_SUCCESS";
+    	public static const OFFICE_DOC_CONVERSION_FAILED:String = "OFFICE_DOC_CONVERSION_FAILED";
+    	public static const SUPPORTED_DOCUMENT:String = "SUPPORTED_DOCUMENT";
+    	public static const UNSUPPORTED_DOCUMENT:String = "UNSUPPORTED_DOCUMENT";
+    	public static const PAGE_COUNT_FAILED:String = "PAGE_COUNT_FAILED";
+    	public static const PAGE_COUNT_EXCEEDED:String = "PAGE_COUNT_EXCEEDED";
+    			
 		public var presentationName:String;
 		public var data:Object;
 		public var completedSlides:Number;
@@ -46,8 +52,7 @@ package org.bigbluebutton.modules.present.events
 		public var fileToUpload:FileReference;
 		public var percentageComplete:Number;
 		
-		public function UploadEvent(type:String)
-		{
+		public function UploadEvent(type:String) {
 			super(type, true, false);
 		}
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
index 165460cc84..b7ca218f3f 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml
@@ -36,7 +36,13 @@
     <mate:Listener type="{UploadEvent.CONVERT_UPDATE}" method="convertUpdate" />
     <mate:Listener type="{UploadEvent.UPDATE_PROGRESS}" method="updateProgress" />
     <mate:Listener type="{UploadEvent.THUMBNAILS_UPDATE}" method="handleThumbnailsProgressEvent" />
-    
+	<mate:Listener type="{UploadEvent.OFFICE_DOC_CONVERSION_FAILED}" method="handleOfficeDocumentConversionFailed"/>
+	<mate:Listener type="{UploadEvent.OFFICE_DOC_CONVERSION_SUCCESS}" method="handleOfficeDocumentConversionSuccess"/>
+	<mate:Listener type="{UploadEvent.SUPPORTED_DOCUMENT}" method="handleSupportedDocument"/>	
+	<mate:Listener type="{UploadEvent.UNSUPPORTED_DOCUMENT}" method="handleUnsupportedDocument"/>
+	<mate:Listener type="{UploadEvent.PAGE_COUNT_FAILED}" method="handlePageCountFailed"/>
+	<mate:Listener type="{UploadEvent.PAGE_COUNT_EXCEEDED}" method="handlePageCountExceeded"/>
+    	    
 	<mx:Script>
 		<![CDATA[
 			import mx.controls.Alert;
@@ -92,10 +98,8 @@
 
             	thumbnailTimer.repeatCount = 20;
             	thumbnailTimer.addEventListener(TimerEvent.TIMER, timerHandler);
-            	thumbnailTimer.addEventListener(TimerEvent.TIMER_COMPLETE, completeHandler);
-            
-            	thumbnailTimer.start();
-				
+            	thumbnailTimer.addEventListener(TimerEvent.TIMER_COMPLETE, completeHandler);           
+            	thumbnailTimer.start();				
 			}
 			
 			private function handleConvertSuccessEvent(event:Event):void {
@@ -184,41 +188,82 @@
 				uploadBtn.visible = false;
 				fileTxtInput.visible = false;
         	}
-        	
+
+			private function handleOfficeDocumentConversionFailed(e:UploadEvent):void {
+				enableControls();
+				displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.document.convert.failed'));
+			}   
+			
+			private function handleOfficeDocumentConversionSuccess(e:UploadEvent):void {
+				progressLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.document.converted')
+				progressBar.label = ResourceUtil.getInstance().getString('bbb.presentation.document.converted');
+				progressBar.setProgress(0, 100);
+				progressBar.validateNow();
+				progressLbl.validateNow();
+			}
+			
+			private function handleSupportedDocument(e:UploadEvent):void {
+				LogUtil.debug("handleSupportedDocument");
+				progressLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.document.supported')
+				progressBar.label = ResourceUtil.getInstance().getString('bbb.presentation.document.supported');
+				progressBar.setProgress(0, 100);
+				progressBar.validateNow();
+				progressLbl.validateNow();
+			}
+			
+			private function handleUnsupportedDocument(e:UploadEvent):void {
+				enableControls();
+				displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.convert.notsupported'));
+			}
+			
+			private function handlePageCountFailed(e:UploadEvent):void {
+				enableControls();
+				displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.convert.nbpage'));
+			}
+			
+			private function handlePageCountExceeded(e:UploadEvent):void {
+				LogUtil.debug("handlePageCountExceeded");
+				enableControls();
+				displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.convert.maxnbpagereach'));
+			}
+			     	
         	private function uploadIOError(e:UploadEvent):void{
         		enableControls();
-        		//Alert.show(ResourceUtil.getInstance().getString('bbb.presentation.error.io'));
-        		LogUtil.error("IO error occured when uploading presentation. FileUploadWindow::uploadIOError");
+        		displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.io'));
         	}
         	
         	private function uploadSecurityError(e:UploadEvent):void{
         		enableControls();
-				//Alert.show(ResourceUtil.getInstance().getString('bbb.presentation.error.security'));
-				LogUtil.error("Security error occured when uploading presentation. FileUploadWindow::uploadSecurityError");
+				displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.security'));
         	}
         	
-		private function enableControls() : void
-		{
-			okCancelBtn.visible = true;
-			selectBtn.enabled = true;
-			uploadBtn.enabled = true;
-			fileTxtInput.enabled = true;			
-		}
+        	private function displayAlert(text:String):void {
+        		Alert.okLabel = ResourceUtil.getInstance().getString('bbb.presentation.ok');        		
+        		Alert.show(text);
 
-		private function convertUpdate(e:UploadEvent):void{
-			progressLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.converted',[e.completedSlides, e.totalSlides]);
-			progressBar.label = ResourceUtil.getInstance().getString('bbb.presentation.converted',[e.completedSlides, e.totalSlides]);
-			progressBar.setProgress(e.completedSlides, e.totalSlides);
-			progressBar.validateNow();
-			progressLbl.validateNow();
-		}
+        	}
+        	
+			private function enableControls():void {
+				okCancelBtn.visible = true;
+				selectBtn.enabled = true;
+				uploadBtn.enabled = true;
+				fileTxtInput.enabled = true;			
+			}
 
-		private function convertError(e:UploadEvent):void{
-			enableControls();
-			okCancelBtn.label = "Ok";
-			okCancelBtn.visible = true;
-			globalDispatch.dispatchEvent(new UploadEvent(UploadEvent.CLOSE_UPLOAD_WINDOW));
-		}
+			private function convertUpdate(e:UploadEvent):void{
+				progressLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.converted',[e.completedSlides, e.totalSlides]);
+				progressBar.label = ResourceUtil.getInstance().getString('bbb.presentation.converted',[e.completedSlides, e.totalSlides]);
+				progressBar.setProgress(e.completedSlides, e.totalSlides);
+				progressBar.validateNow();
+				progressLbl.validateNow();
+			}
+
+			private function convertError(e:UploadEvent):void{
+				enableControls();
+				okCancelBtn.label = "Ok";
+				okCancelBtn.visible = true;
+				globalDispatch.dispatchEvent(new UploadEvent(UploadEvent.CLOSE_UPLOAD_WINDOW));
+			}
 
 		private function convertSuccess(e:UploadEvent):void{
 			okCancelBtn.label = ResourceUtil.getInstance().getString('bbb.presentation.ok');