diff --git a/src/config.py b/src/config.py
index 444aa7ffc..4359dcab0 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1780,23 +1780,27 @@ class Add_remove_emoticons_window:
 		iter = model.get_iter_from_string(row)
 		model.set_value(iter, 0, new_text)
 
+	def update_preview(self, widget):
+		path_to_file = widget.get_preview_filename()
+		widget.get_preview_widget().set_from_file(path_to_file)
+
 	def on_set_image_button_clicked(self, widget, data = None):
 		(model, iter) = self.emot_tree.get_selection().get_selected()
 		if not iter:
 			return
 		file = model.get_value(iter, 1)
-		dialog = gtk.FileChooserDialog('Choose image', None,
+		dialog = gtk.FileChooserDialog(_('Choose image'), None,
 					gtk.FILE_CHOOSER_ACTION_OPEN,
 					(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 					gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 		dialog.set_default_response(gtk.RESPONSE_OK)
 		filter = gtk.FileFilter()
-		filter.set_name('All files')
+		filter.set_name(_('All files'))
 		filter.add_pattern('*')
 		dialog.add_filter(filter)
 
 		filter = gtk.FileFilter()
-		filter.set_name('Images')
+		filter.set_name(_('Images'))
 		filter.add_mime_type('image/png')
 		filter.add_mime_type('image/jpeg')
 		filter.add_mime_type('image/gif')
@@ -1807,6 +1811,9 @@ class Add_remove_emoticons_window:
 		filter.add_pattern('*.xpm')
 		dialog.add_filter(filter)
 		dialog.set_filter(filter)
+		dialog.set_use_preview_label(False)
+		dialog.set_preview_widget(gtk.Image())
+		dialog.connect('selection-changed', self.update_preview)
 
 		file = os.path.join(os.getcwd(), file)
 		dialog.set_filename(file)
diff --git a/src/vcard.py b/src/vcard.py
index 25fcd919e..24e457158 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -56,11 +56,11 @@ class Vcard_window:
 			gajim.connections[self.account].update_user(self.user.jid,
 				self.user.name, self.user.groups)
 		#log history ?
-		oldlog = 1
+		oldlog = True
 		no_log_for = gajim.config.get_per('accounts', self.account,
 			'no_log_for').split()
 		if self.user.jid in no_log_for:
-			oldlog = 0
+			oldlog = False
 		log = self.xml.get_widget('log_checkbutton').get_active()
 		if not log and not self.user.jid in no_log_for:
 			no_log_for.append(self.user.jid)
@@ -80,20 +80,24 @@ class Vcard_window:
 			return False
 		return True
 
+	def update_preview(self, widget):
+		path_to_file = widget.get_preview_filename()
+		widget.get_preview_widget().set_from_file(path_to_file)
+
 	def on_set_avatar_button_clicked(self, widget):
 		file = None
-		dialog = gtk.FileChooserDialog('Choose avatar', None,
+		dialog = gtk.FileChooserDialog(_('Choose avatar'), None,
 			gtk.FILE_CHOOSER_ACTION_OPEN,
 			(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 			gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 		dialog.set_default_response(gtk.RESPONSE_OK)
 		filter = gtk.FileFilter()
-		filter.set_name('All files')
+		filter.set_name(_('All files'))
 		filter.add_pattern('*')
 		dialog.add_filter(filter)
 
 		filter = gtk.FileFilter()
-		filter.set_name('Images')
+		filter.set_name(_('Images'))
 		filter.add_mime_type('image/png')
 		filter.add_mime_type('image/jpeg')
 		filter.add_mime_type('image/gif')
@@ -104,6 +108,10 @@ class Vcard_window:
 		filter.add_pattern('*.xpm')
 		dialog.add_filter(filter)
 		dialog.set_filter(filter)
+		dialog.set_use_preview_label(False)
+		dialog.set_preview_widget(gtk.Image())
+		dialog.set_preview_widget(True)
+		dialog.connect('selection-changed', self.update_preview)
 
 		ok = False
 		while not ok: