diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index 664ad3e6..b2f52648 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -459,10 +459,15 @@ class MainFrameController {
             params['home'] = core.home
             mvcGroup.createMVCGroup("certificate-warning", params)
         } else {
+            int count = 0
             view.selectedSharedFiles().each {
+                count++
                 core.eventBus.publish(new UICreateCertificateEvent(sharedFile : it))
             }
-            JOptionPane.showMessageDialog(null, trans("CERTIFICATES_ISSUED"))
+            if (count > 1)
+                JOptionPane.showMessageDialog(null, trans("CERTIFICATES_ISSUED"))
+            else if (count == 1)
+                JOptionPane.showMessageDialog(null, trans("CERTIFICATE_ISSUED"))
         }
     }
     
diff --git a/gui/griffon-app/i18n/messages.properties b/gui/griffon-app/i18n/messages.properties
index d50d3981..239b26db 100644
--- a/gui/griffon-app/i18n/messages.properties
+++ b/gui/griffon-app/i18n/messages.properties
@@ -221,7 +221,8 @@ SELECT_FILES_OR_DIRECTORIES_TO_SHARE=Select files or folders to share
 
 # various JOption prompts
 ENTER_REASON_OPTIONAL=Enter reason (optional)
-CERTIFICATES_ISSUED=Certificate(s) have been issued
+CERTIFICATE_ISSUED=Certificate has been issued
+CERTIFICATES_ISSUED=Certificates have been issued
 PLEASE_SELECT_ONE_FILE_DETAILS=Please select only one file to view it's details
 PLEASE_SELECT_ONE_FILE_FOLDER=Please select only one file to open it's containing folder
 COPY_PASTE_SERVER_ADDRESS=Copy/paste the address of the server here