diff --git a/imagelist.html b/imagelist.html
index f187fb8..7eeabe4 100644
--- a/imagelist.html
+++ b/imagelist.html
@@ -341,7 +341,8 @@
 					{{vtSet: Sortiment = "" }}
 				{{vtEndIf}}
 
-				{{vtCalc: image_is_buyable( '{Verzeichnis:escaped}/{Dateiname:escaped}', '{vtGet:Sortiment}', '{vtGet:GalerieProdukte}{Produkte}' ) ? 1 : 0 }}
+				{{vtCalc: image_is_buyable( '{Verzeichnis:escaped}/{Dateiname:escaped}', '{vtGet:Sortiment}', '{vtGet:GalerieProdukte}
+{Produkte}' ) ? 1 : 0 }}
 				{{vtIf: {vtResult} .eq. 1 }}
 					{{vtSet: ShowCartButtons = "1" }}
 					{{vtSet: Image[buyable] = "1" }}
diff --git a/order._onchange.html b/order._onchange.html
index fb23515..d4506ab 100644
--- a/order._onchange.html
+++ b/order._onchange.html
@@ -59,9 +59,9 @@
 		{{vtSet: Suffix = "_inf" }}
 	{{vtEndIf}}
 	{{vtIf: {vtGet:Language} .eq. en}}
-		{{vtSet: Mailtext="{vtInclude: /config/mails/notify_delivery_en{vtGetSuffix}.txt, mails/notify_delivery_en{vtGet:Suffix}.txt, /config/mails/notify_delivery_en.txt, mails/notify_delivery_en.txt }"}}
+		{{vtCapture: Mailtext}}{{vtInclude: /config/mails/notify_delivery_en{vtGetSuffix}.txt, mails/notify_delivery_en{vtGet:Suffix}.txt, /config/mails/notify_delivery_en.txt, mails/notify_delivery_en.txt }}{{vtEndCapture}}
 	{{vtElse}}
-		{{vtSet: Mailtext="{vtInclude: /config/mails/notify_delivery{vtGet:Suffix}.txt, mails/notify_delivery{vtGet:Suffix}.txt, /config/mails/notify_delivery.txt, mails/notify_delivery.txt }"}}
+		{{vtCapture: Mailtext}}{{vtInclude: /config/mails/notify_delivery{vtGet:Suffix}.txt, mails/notify_delivery{vtGet:Suffix}.txt, /config/mails/notify_delivery.txt, mails/notify_delivery.txt }}{{vtEndCapture}}
 	{{vtEndIf}}
 	{{vtDo: -act="mail", -to="{Email}", -subject="{vtGet:s_txt_0061}", -message="{vtGet:Mailtext,raw}"}}
 	{{vtDo: -act="update", -obj="{vtID}", DeliveryNotificationSent="{vtDate|d.m.Y H:i}"}}