Index: extensions/Piwecard/admin/template/admin_configuration.tpl
===================================================================
--- extensions/Piwecard/admin/template/admin_configuration.tpl	(revision 20180)
+++ extensions/Piwecard/admin/template/admin_configuration.tpl	(revision 20202)
@@ -3,4 +3,6 @@
 {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
 {combine_script id='piwecard' load="footer" path='plugins/Piwecard/js/piwecard.js'}
+{combine_script id='colorpicker' load="footer" path='plugins/Piwecard/js/colorpicker/js/colorpicker.js'}
+{combine_css path="plugins/Piwecard/js/colorpicker/css/colorpicker.css"}
 
 {footer_script require="piwecard"}
@@ -31,4 +33,34 @@
 			$("#ecard_email_format_default_text").prop('checked', true);
 		}
+	});
+	
+	if ($("#ecard_image_border").prop('checked') == true) {
+		$("#ecard_image_border_options").css("display","block");
+	} else {
+		$("#ecard_image_border_options").css("display","none");
+	}
+
+	$("#ecard_image_border").change(function(){
+		if ($("#ecard_image_border").prop('checked') == true) {
+			$("#ecard_image_border_options").show("fast");
+		} else {
+			$("#ecard_image_border_options").hide("fast");
+		}
+	});
+	
+	$('#ecard_image_border_color').ColorPicker({
+		onSubmit: function(hsb, hex, rgb, element) {
+			$(element).val(hex);
+			$(element).ColorPickerHide();
+		},
+		onBeforeShow: function () {
+			$(this).ColorPickerSetColor(this.value);
+		},
+		onChange: function (hsb, hex, rgb) {
+			$('#ecard_image_border_color').val(hex);
+		}
+	})
+	.bind('keyup', function(){
+		$(this).ColorPickerSetColor(this.value);
 	});
 });
@@ -110,4 +142,29 @@
 				{/foreach}
 			</div>
+			<div class="ecard_form_line">
+				<div>
+					<input type="checkbox" name="ecard_image_border" id="ecard_image_border" {$ecard_image_border} value="1" />
+					<label for="ecard_image_border"> {'piwecard_image_border'|@translate}</label>
+				</div>
+				<div id="ecard_image_border_options">
+					<span>
+						<label for="ecard_image_border_style">{'piwecard_image_border_style'|@translate}</label>
+						<select name="ecard_image_border_style" id="ecard_image_border_style">
+							<option value="solid" {$ecard_image_border_style.solid}>{'piwecard_image_border_solid'|@translate}</option>
+							<option value="dashed" {$ecard_image_border_style.dashed}>{'piwecard_image_border_dashed'|@translate}</option>
+							<option value="dotted" {$ecard_image_border_style.dotted}>{'piwecard_image_border_dotted'|@translate}</option>
+							<option value="double"{$ecard_image_border_style.double}>{'piwecard_image_border_double'|@translate}</option>
+						</select>
+					</span>
+					<span>
+						<label for="ecard_image_border_width">{'piwecard_image_border_width'|@translate}</label>
+						<input type="text" size="6" maxlength="20" name="ecard_image_border_width" id="ecard_image_border_width" value="{$ecard_image_border_width}" />
+					</span>
+					<span>
+						<label for="ecard_image_border_color">{'piwecard_image_border_color'|@translate}</label>
+						<input type="text" maxlength="6" size="6" name="ecard_image_border_color" id="ecard_image_border_color" value="{$ecard_image_border_color}" />
+					</span>
+				</div>
+			</div>
 		</fieldset>
 
Index: extensions/Piwecard/admin/template/admin_management.tpl
===================================================================
--- extensions/Piwecard/admin/template/admin_management.tpl	(revision 20180)
+++ extensions/Piwecard/admin/template/admin_management.tpl	(revision 20202)
@@ -103,5 +103,5 @@
 							</td>
 							<td>
-								<a href="{$ecard_file.url}">{$ecard_file.title}</a>
+								<a href="{$ecard_file.url}" target="_blank">{$ecard_file.title}</a>
 							</td>
 							<td>
@@ -109,5 +109,7 @@
 							</td>
 							<td>
-								{$ecard_file.recipient_name} ({$ecard_file.recipient_email}) 
+								{foreach from=$ecard_file.recipients item=recipient}
+									{$recipient.name} ({$recipient.email})<br />
+								{/foreach}
 							</td>
 							<td>
@@ -123,4 +125,5 @@
 				</tbody>
 			</table>
+			{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
 			<fieldset>
 				<legend>{'piwecard_delete_selected'|@translate}</legend>
@@ -144,3 +147,2 @@
 	{/if}
 </div>
-{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
