diff --git a/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png b/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3632504200d0f24e6f623575f37fdaba4ef5bf34
Binary files /dev/null and b/dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png differ
diff --git a/doc/images/dolibarr_screenshot10_1280x800.png b/doc/images/dolibarr_screenshot10_1280x800.png
index 92892c7150beda19b8f3a5c0704e8cfca413af78..f5c878f8d2cdff0acf41b6409c7e297eae912ab6 100644
Binary files a/doc/images/dolibarr_screenshot10_1280x800.png and b/doc/images/dolibarr_screenshot10_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot2_1280x800.png b/doc/images/dolibarr_screenshot2_1280x800.png
index 9f145db0f6af161f574406df8248f15d1f11532f..c5e30130c3eb4103b0bc66c6c2204d9083b2bc1c 100644
Binary files a/doc/images/dolibarr_screenshot2_1280x800.png and b/doc/images/dolibarr_screenshot2_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot4_1280x800.png b/doc/images/dolibarr_screenshot4_1280x800.png
index 90d5ed059b817dd7945bae7952149fec654bc1bd..f76c6f07522c7da234abc41227c7822e6e09e35e 100644
Binary files a/doc/images/dolibarr_screenshot4_1280x800.png and b/doc/images/dolibarr_screenshot4_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot5_1280x800.png b/doc/images/dolibarr_screenshot5_1280x800.png
index 90aace0bfcb6b4830e4c324fd68f5a548feb9d5e..96700f89bd517b3d56634853e9af463d2f797756 100644
Binary files a/doc/images/dolibarr_screenshot5_1280x800.png and b/doc/images/dolibarr_screenshot5_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot7_1280x800.png b/doc/images/dolibarr_screenshot7_1280x800.png
index b17b57e571ed67f2f6574aa946e859c5a2e24f4a..698bcac9c8f2ce56421efb5e99ab16eab00260c5 100644
Binary files a/doc/images/dolibarr_screenshot7_1280x800.png and b/doc/images/dolibarr_screenshot7_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot8_1280x800.png b/doc/images/dolibarr_screenshot8_1280x800.png
index 6f2341297a6c34efcf51ea4979d966e3505024de..14b9c3693b18978804453a75136063b0469f62a8 100644
Binary files a/doc/images/dolibarr_screenshot8_1280x800.png and b/doc/images/dolibarr_screenshot8_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot9_1280x800.png b/doc/images/dolibarr_screenshot9_1280x800.png
index 5c71c9395bb2119e54c020463aff5b9962331022..97310a4f4eb905a966b684ec72fea4949ab2663c 100644
Binary files a/doc/images/dolibarr_screenshot9_1280x800.png and b/doc/images/dolibarr_screenshot9_1280x800.png differ
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 73717696dc7ceeeadc19c406d2da9ef682de9ce9..92dc2726030b20a163964cc5f57131b6cbbc85c0 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -876,7 +876,7 @@ else
 			{
 				print "\n\n<div class=\"tabsAction\">\n";
 
-				if (($object->statut == 0) && $user->rights->mailing->creer)
+				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditMailing").'</a>';
 				}
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index cf7163671a36f00385f07a275d568377c5999c6a..a397f5ec874babb509282b7dacb126d82cdcf85e 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config )
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
-	 	['Source','Maximize'],
+	 	['Source','Maximize','Preview'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],
diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
index cf7163671a36f00385f07a275d568377c5999c6a..a397f5ec874babb509282b7dacb126d82cdcf85e 100644
--- a/htdocs/theme/md/ckeditor/config.js
+++ b/htdocs/theme/md/ckeditor/config.js
@@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config )
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
-	 	['Source','Maximize'],
+	 	['Source','Maximize','Preview'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],