diff --git a/addressbook/templates/default/format_de.tpl b/addressbook/templates/default/format_de.tpl
index 5eb443d5f4..187c165473 100644
--- a/addressbook/templates/default/format_de.tpl
+++ b/addressbook/templates/default/format_de.tpl
@@ -19,4 +19,7 @@
 	<tr>
 		<td><font face="{font}">{zip}</font></td>
 	</tr>
+	<tr>
+		<td><font face="{font}">{country}</font></td>
+	</tr>
 </table>
diff --git a/addressbook/templates/default/line_format_de.tpl b/addressbook/templates/default/line_format_de.tpl
new file mode 100644
index 0000000000..c5018ef69b
--- /dev/null
+++ b/addressbook/templates/default/line_format_de.tpl
@@ -0,0 +1,7 @@
+<!-- $Id$ -->
+
+<table border="0" cellpadding="2" cellspacing="2">
+	<tr>
+		<td><font face="{font}" size="{fontsize}">{company}&nbsp;-&nbsp;{street}&nbsp;-&nbsp;{zip}&nbsp;{city}{county}</font></td>
+	</tr>
+</table>
diff --git a/addressbook/templates/default/line_format_us.tpl b/addressbook/templates/default/line_format_us.tpl
new file mode 100644
index 0000000000..441489ec77
--- /dev/null
+++ b/addressbook/templates/default/line_format_us.tpl
@@ -0,0 +1,7 @@
+<!-- $Id$ -->
+
+<table border="0" cellpadding="2" cellspacing="2">
+	<tr> 
+		<td><font face="{font}" size="{fontsize}">{company}&nbsp;-&nbsp;{street}&nbsp;-&nbsp;{city},&nbsp;{state}&nbsp;{zip}{country}</font></td>
+	</tr>
+</table>