diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index b6ce3d8b9a5..5a5c2f25c0e 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -165,14 +165,14 @@ if (empty($conf->use_javascript_ajax)) {
 		$constante = 'FCKEDITOR_ENABLE_'.$const;
 		print '<!-- constant = '.$constante.' -->'."\n";
 		print '<tr class="oddeven">';
-		print '<td width="16">'.img_object("", $picto[$const]).'</td>';
+		print '<td class="width20">'.img_object("", $picto[$const]).'</td>';
 		print '<td>';
 		print $langs->trans($desc);
 		if ($const == 'DETAILS') {
 			print '<br><span class="warning">'.$langs->trans("FCKeditorForProductDetails2").'</span>';
 		}
 		print '</td>';
-		print '<td class="center centpercent">';
+		print '<td class="center centpercent width100">';
 		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
 		if ($value == 0) {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 7ded4b3fd62..a254cdd4741 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -7,10 +7,10 @@ DIRECTION=ltr
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 # cid0jp is for Japanish
 # cid0kr is for Korean
-# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
+# DejaVuSans is for some Eastern languages, greek, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
 # freeserif is for Tamil
-FONTFORPDF=helvetica
+FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=.
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2e633126f64..e0309535ab7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -786,6 +786,10 @@ class Societe extends CommonObject
 	 */
 	public $multicurrency_code;
 
+	/**
+	 * @var string  Set if company email found into unsubscribe of emailing list table
+	 */
+	public $no_email;
 
 	// Fields loaded by fetchPartnerships()