diff --git a/data/glade/vcard_information_window.glade b/data/glade/vcard_information_window.glade
index 6872adc66..702118f4c 100644
--- a/data/glade/vcard_information_window.glade
+++ b/data/glade/vcard_information_window.glade
@@ -62,23 +62,293 @@
False
-
+
12
True
- 8
- 3
False
- 6
- 12
+ 12
-
+
True
- False
- False
+ 8
+ 2
+ False
+ 6
+ 12
-
+
+ True
+ False
+ False
+
+
+
+ True
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+
+ True
+ False
+ False
+
+
+
+ True
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+
+ True
+ True
+ False
+ 0
+
+
+
+ 6
+ True
+ 1
+ 4
+ False
+ 6
+ 12
+
+
+
+ True
+ False
+ False
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ 1
+ 2
+ 0
+ 1
+
+
+
+
+
+
+ True
+ False
+ False
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ 3
+ 4
+ 0
+ 1
+
+
+
+
+
+
+ True
+ Subscription:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ Ask:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 2
+ 3
+ 0
+ 1
+ fill
+
+
+
+
+
+
+
+
+ True
+ More
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ label_item
+
+
+
+
+ 0
+ 2
+ 7
+ 8
+
+
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 1
+ 2
+ 0
+ 1
+
+
+
+
+
+
True
True
@@ -96,25 +366,17 @@
False
0
+
+ 1
+ 2
+ 1
+ 2
+
+
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
-
- True
- False
- False
-
+
True
True
@@ -132,166 +394,69 @@
False
0
+
+ 1
+ 2
+ 4
+ 5
+
+
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
- True
- True
- False
- 0
-
- 6
+
True
- 1
- 4
- False
- 6
- 12
-
-
-
- True
- False
- False
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
-
-
- 1
- 2
- 0
- 1
-
-
-
-
-
-
- True
- False
- False
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
-
-
- 3
- 4
- 0
- 1
-
-
-
-
-
-
- True
- Subscription:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- Ask:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 2
- 3
- 0
- 1
- fill
-
-
-
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ True
+ True
+ 0
+ 0
+ 5
+ 5
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+ 1
+ 2
+ 5
+ 6
+
+
-
+
True
- More
+ True
+ _Log conversation history
+ True
+ GTK_RELIEF_NORMAL
+ True
+ True
+ False
+ True
+
+
+ 0
+ 2
+ 6
+ 7
+ fill
+
+
+
+
+
+
+ True
+ Nickname:
False
False
GTK_JUSTIFY_LEFT
@@ -307,345 +472,207 @@
0
- label_item
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ Jabber ID:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ Resource:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 2
+ 3
+ fill
+
+
+
+
+
+
+ True
+ Status:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 3
+ 4
+ fill
+
+
+
+
+
+
+ True
+ Client:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 4
+ 5
+ fill
+
+
+
+
+
+
+ True
+ OS:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 5
+ 6
+ fill
+
- 0
- 2
- 7
- 8
-
+ 0
+ True
+ True
-
+
True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
- 1
- 2
- 0
- 1
-
-
-
-
-
-
- True
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 4
- 5
-
-
-
-
-
-
- True
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- True
- True
- 0
- 0
- 5
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 5
- 6
-
-
-
-
-
-
- True
- True
- _Log conversation history
- True
- GTK_RELIEF_NORMAL
- True
- True
- False
- True
-
-
- 0
- 2
- 6
- 7
- fill
-
-
-
-
-
-
- True
- Nickname:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- Jabber ID:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- Resource:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 2
- 3
- fill
-
-
-
-
-
-
- True
- Status:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 3
- 4
- fill
-
-
-
-
-
-
- True
- Client:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 4
- 5
- fill
-
-
-
-
-
-
- True
- OS:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 5
- 6
- fill
-
-
-
-
-
-
- True
- GTK_RELIEF_NORMAL
- True
+ False
+ 0
-
- True
- False
- False
+
+ True
+ GTK_RELIEF_NORMAL
+ True
-
+
True
- 0
- 0
- 0
- 0
+ False
+ False
+
+
+
+ True
+ 0.5
+ 0
+ 0
+ 0
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
- 2
- 3
- 0
- 6
- fill
-
+ 0
+ True
+ True