From c994e0e7cd9f593eb21ff80c7c1ddbeaf2a1b12a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 18 Nov 2011 14:44:48 +0000
Subject: - Applied fixes from trunk up to r5451

---
 program/js/app.js         | 2 +-
 program/js/googiespell.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/js')

diff --git a/program/js/app.js b/program/js/app.js
index 5902b1d74..8b98a4268 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5738,7 +5738,7 @@ function rcube_webmail()
   this.plain2html = function(plainText, id)
   {
     var lock = this.set_busy(true, 'converting');
-    $(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
+    $(document.getElementById(id)).val(plainText ? '<pre>'+plainText+'</pre>' : '');
     this.set_busy(false, null, lock);
   };
 
diff --git a/program/js/googiespell.js b/program/js/googiespell.js
index e3fdf7d3b..96d612ca2 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -1,6 +1,8 @@
 /*
  SpellCheck
     jQuery'fied spell checker based on GoogieSpell 4.0
+      (which was published under GPL "version 2 or any later version")
+
  Copyright (C) 2006 Amir Salihefendic
  Copyright (C) 2009 Aleksander Machniak
  Copyright (C) 2011 Kolab Systems AG
-- 
cgit v1.2.3