diff --git a/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap
index 4891d7e6b..465f564ad 100644
--- a/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap
@@ -307,8 +307,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_SETT IMPLEMENTATION.
 
   METHOD save.
 
-    DATA: lt_post_fields TYPE tihttpnvp.
-
+    DATA: lt_post_fields TYPE tihttpnvp,
+          lv_msg         TYPE string.
 
     lt_post_fields = parse_post( it_postdata ).
 
@@ -317,7 +317,8 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_SETT IMPLEMENTATION.
 
     mo_repo->refresh( ).
 
-    MESSAGE |{ mo_repo->get_name( ) }: settings saved successfully.| TYPE 'S'.
+    lv_msg = |{ mo_repo->get_name( ) }: settings saved successfully.|.
+    MESSAGE lv_msg TYPE 'S'.
 
   ENDMETHOD.
 
diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap
index 125f1217b..4e7cb8af2 100644
--- a/src/ui/zcl_abapgit_popups.clas.abap
+++ b/src/ui/zcl_abapgit_popups.clas.abap
@@ -504,8 +504,9 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
       ENDIF.
       ASSERT <ls_branch> IS ASSIGNED.
       rs_branch = lo_branches->find_by_name( <ls_branch>-name ).
-      MESSAGE |Branch switched from { zcl_abapgit_git_branch_list=>get_display_name( iv_default_branch ) } to {
-        zcl_abapgit_git_branch_list=>get_display_name( rs_branch-name ) } | TYPE 'S'.
+      lv_text = |Branch switched from { zcl_abapgit_git_branch_list=>get_display_name( iv_default_branch ) } to {
+        zcl_abapgit_git_branch_list=>get_display_name( rs_branch-name ) } |.
+      MESSAGE lv_text TYPE 'S'.
     ENDIF.
 
   ENDMETHOD.