diff --git a/src/zabapgit_page_commit.prog.abap b/src/zabapgit_page_commit.prog.abap
index 5dcc5015e..96433d500 100644
--- a/src/zabapgit_page_commit.prog.abap
+++ b/src/zabapgit_page_commit.prog.abap
@@ -202,7 +202,8 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
     ro_html->add( '<div class="row">' ).
     ro_html->add( '<label for="c-body">body</label>' ).
 
-    ro_html->add( |<textarea id="c-body" name="body" rows="10" cols="{ lo_settings->get_commitmsg_body_size( ) }" wrap="hard"></textarea>| ).
+    ro_html->add( |<textarea id="c-body" name="body" rows="10" cols="| &&
+                  |{ lo_settings->get_commitmsg_body_size( ) }" wrap="hard"></textarea>| ).
     ro_html->add( '<input type="submit" class="hidden-submit">' ).
     ro_html->add( '</div>' ).
 
diff --git a/src/zabapgit_page_settings.prog.abap b/src/zabapgit_page_settings.prog.abap
index c80a04a08..77afb7432 100644
--- a/src/zabapgit_page_settings.prog.abap
+++ b/src/zabapgit_page_settings.prog.abap
@@ -300,11 +300,13 @@ CLASS lcl_gui_page_settings IMPLEMENTATION.
     ro_html->add( |<h2>Commit Message</h2>| ).
     ro_html->add( |<label for="comment_length">Max. length of comment</label>| ).
     ro_html->add( |<br>| ).
-    ro_html->add( `<input name="comment_length" type="number" step="10" size="3" maxlength="3" min="50" max="100" value="` && mo_settings->get_commitmsg_comment_length( ) && `">` ).
+    ro_html->add( |<input name="comment_length" type="number" step="10" size="3" maxlength="3" min="50" max="100"| &&
+                  | value="{ mo_settings->get_commitmsg_comment_length( ) }">| ).
     ro_html->add( |<br>| ).
     ro_html->add( |<label for="body_size">Max. line size of body</label>| ).
     ro_html->add( |<br>| ).
-    ro_html->add( `<input name="body_size" type="number" step="10" size="3"  maxlength="3" min="50" max="100" value="` && mo_settings->get_commitmsg_body_size( ) && `">` ).
+    ro_html->add( |<input name="body_size" type="number" step="10" size="3" maxlength="3" min="50" max="100"| &&
+                  | value="{ mo_settings->get_commitmsg_body_size( ) }">| ).
     ro_html->add( |<br>| ).
     ro_html->add( |<br>| ).
   ENDMETHOD.