diff --git a/src/demos/zdemo_excel_outputopt_incl.prog.abap b/src/demos/zdemo_excel_outputopt_incl.prog.abap
index 4930d51..30cde52 100644
--- a/src/demos/zdemo_excel_outputopt_incl.prog.abap
+++ b/src/demos/zdemo_excel_outputopt_incl.prog.abap
@@ -104,7 +104,7 @@ CLASS lcl_output IMPLEMENTATION.
         IF sy-batch IS INITIAL.
           cl_output->download_frontend( ).
         ELSE.
-          MESSAGE e001(00) WITH 'Frontenddownload impossible in background processing'.
+          MESSAGE e802(ZABAP2XLSX).
         ENDIF.
 
       WHEN rb_back.
@@ -114,7 +114,7 @@ CLASS lcl_output IMPLEMENTATION.
         IF sy-batch IS INITIAL.
           cl_output->display_online( ).
         ELSE.
-          MESSAGE e001(00) WITH 'Online display absurd in background processing'.
+          MESSAGE e803(ZABAP2XLSX).
         ENDIF.
 
       WHEN rb_send.
@@ -352,9 +352,9 @@ CLASS lcl_output IMPLEMENTATION.
         COMMIT WORK.
 
         IF sent IS INITIAL.
-          MESSAGE i500(sbcoms) WITH p_email.
+          MESSAGE i804(ZABAP2XLSX) WITH p_email.
         ELSE.
-          MESSAGE s022(so).
+          MESSAGE s805(ZABAP2XLSX).
           MESSAGE 'Document ready to be sent - Check SOST or SCOT' TYPE 'I'.
         ENDIF.
 
diff --git a/src/zabap2xlsx.msag.xml b/src/zabap2xlsx.msag.xml
index b9dcfde..988574d 100644
--- a/src/zabap2xlsx.msag.xml
+++ b/src/zabap2xlsx.msag.xml
@@ -92,12 +92,48 @@
      <MSGNR>016</MSGNR>
      <TEXT>--- 800-   : Other messages</TEXT>
     </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>400</MSGNR>
+     <TEXT>Data has been exported successfully</TEXT>
+    </T100>
     <T100>
      <SPRSL>E</SPRSL>
      <ARBGB>ZABAP2XLSX</ARBGB>
      <MSGNR>800</MSGNR>
      <TEXT>Unable to interpret input as column</TEXT>
     </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>801</MSGNR>
+     <TEXT>Spreadsheet cannot be called (return code &amp;1)</TEXT>
+    </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>802</MSGNR>
+     <TEXT>Frontend download impossible in background processing</TEXT>
+    </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>803</MSGNR>
+     <TEXT>Online display absurd in background processing</TEXT>
+    </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>804</MSGNR>
+     <TEXT>Document not sent to &amp;1</TEXT>
+    </T100>
+    <T100>
+     <SPRSL>E</SPRSL>
+     <ARBGB>ZABAP2XLSX</ARBGB>
+     <MSGNR>805</MSGNR>
+     <TEXT>Document sent</TEXT>
+    </T100>
    </T100>
   </asx:values>
  </asx:abap>
diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap
index 2de0b54..8f57489 100644
--- a/src/zcl_excel_worksheet.clas.abap
+++ b/src/zcl_excel_worksheet.clas.abap
@@ -1418,7 +1418,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
       ASSIGN COMPONENT l_save_index OF STRUCTURE <f_excel_line>
       TO <f_excel_column>.
       IF sy-subrc NE 0.
-        MESSAGE e059(0k) WITH 'FATAL ERROR' RAISING fatal_error.
+        MESSAGE e801(ZABAP2XLSX) WITH 'FATAL ERROR' RAISING fatal_error.
       ENDIF.
 
       LOOP AT lt_fieldcat_kkblo ASSIGNING <f_fieldcat_line>
@@ -2767,8 +2767,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
     error_doi.
 
 * if save successfully -> raise successful message
-*  message i499(sy) with 'Document is Exported to ' p_path.
-    MESSAGE i499(sy) WITH 'Data has been exported successfully'.
+    MESSAGE i400(ZABAP2XLSX).
 
     CLEAR:
       ls_path,