diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 2eee30d14e..a1affbb3ee 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -140,7 +140,6 @@ public class BrowseBean implements IContextListener
       this.userPreferencesBean = userPreferencesBean; 
    }
 
-   
    /**
     * @param lockService The Lock Service to set.
     */
diff --git a/source/java/org/alfresco/web/bean/TrashcanBean.java b/source/java/org/alfresco/web/bean/TrashcanBean.java
index c94f6c5b93..abeb8023ce 100644
--- a/source/java/org/alfresco/web/bean/TrashcanBean.java
+++ b/source/java/org/alfresco/web/bean/TrashcanBean.java
@@ -562,6 +562,13 @@ public class TrashcanBean implements IContextListener
       }
    };
    
+   private NodePropertyResolver resolverEncoding = new NodePropertyResolver() {
+      public Object get(Node node) {
+         ContentData content = (ContentData)node.getProperties().get(ContentModel.PROP_CONTENT);
+         return (content != null ? content.getEncoding() : null);
+      }
+   };
+   
    private NodePropertyResolver resolverDeletedDate = new NodePropertyResolver() {
       public Object get(Node node) {
          return node.getProperties().get(ContentModel.PROP_ARCHIVED_DATE);
@@ -640,6 +647,7 @@ public class TrashcanBean implements IContextListener
             node.addPropertyResolver("isFolder", resolverIsFolder);
             node.addPropertyResolver("mimetype", resolverMimetype);
             node.addPropertyResolver("size", resolverSize);
+            node.addPropertyResolver("encoding", resolverEncoding);
             
             if (this.dictionaryService.isSubClass(node.getType(), ContentModel.TYPE_FOLDER) == true && 
                 this.dictionaryService.isSubClass(node.getType(), ContentModel.TYPE_SYSTEM_FOLDER) == false)
diff --git a/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java b/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
index a62676c5e6..0b9fc1f1cd 100644
--- a/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
+++ b/source/java/org/alfresco/web/ui/repo/converter/CharsetConverter.java
@@ -58,11 +58,6 @@ public class CharsetConverter implements Converter
     */
    public String getAsString(FacesContext context, UIComponent component, Object value)
    {
-      if (value == null)
-      {
-         throw new IllegalArgumentException(I18NUtil.getMessage("error_charset_null"));
-      }
-      
       String result = null;
       
       if (value instanceof Charset)