diff --git a/mozilla/grendel/sources/grendel/addressbook/AddressBookManager.java b/mozilla/grendel/sources/grendel/addressbook/AddressBookManager.java index 5dcbaf6bb34..e0c886915e2 100644 --- a/mozilla/grendel/sources/grendel/addressbook/AddressBookManager.java +++ b/mozilla/grendel/sources/grendel/addressbook/AddressBookManager.java @@ -45,7 +45,7 @@ public final class AddressBookManager * Get the addressbooks branch from preferances. * Done here incase any other initation requires it. */ - books = Preferences.getPreferances().getAddressbooks(); + books = Preferences.getPreferences().getAddressbooks(); } /** diff --git a/mozilla/grendel/sources/grendel/javamail/Gnu.java b/mozilla/grendel/sources/grendel/javamail/Gnu.java index 0411861d51a..841e2d15b68 100644 --- a/mozilla/grendel/sources/grendel/javamail/Gnu.java +++ b/mozilla/grendel/sources/grendel/javamail/Gnu.java @@ -107,10 +107,10 @@ public final class Gnu { //XXX This refers to the HEAD CVS of GNU JavaMail String host = nntp.getHost(); if (host!=null) { - props.put("mail.nntp.newsrc.file", Preferences.getPreferances().getProfilePath()+host+".newsrc"); + props.put("mail.nntp.newsrc.file", Preferences.getPreferences().getProfilePath()+host+".newsrc"); props.put("mail.nntp.host", host); } else { - props.put("mail.nntp.newsrc.file", Preferences.getPreferances().getProfilePath()+"news.rc"); + props.put("mail.nntp.newsrc.file", Preferences.getPreferences().getProfilePath()+"news.rc"); } props.put("mail.nntp.listall", "true"); //XXX Mozilla.org Bug diff --git a/mozilla/grendel/sources/grendel/javamail/JMProviders.java b/mozilla/grendel/sources/grendel/javamail/JMProviders.java index 669cbe3637c..e88ca6f1392 100644 --- a/mozilla/grendel/sources/grendel/javamail/JMProviders.java +++ b/mozilla/grendel/sources/grendel/javamail/JMProviders.java @@ -61,7 +61,7 @@ public final class JMProviders { public static Session getSession() { if (sess==null) { - options_mail=Preferences.getPreferances().getPropertyPrefs("options").getPropertyPrefs("mail"); + options_mail=Preferences.getPreferences().getPropertyPrefs("options").getPropertyPrefs("mail"); Properties props = new Properties(); sess=Session.getDefaultInstance(props, null); //fSession.setDebug(options_mail.getPropertyBoolean("debug")); diff --git a/mozilla/grendel/sources/grendel/prefs/Preferences.java b/mozilla/grendel/sources/grendel/prefs/Preferences.java index a5b82353c48..d9ea58dff9e 100644 --- a/mozilla/grendel/sources/grendel/prefs/Preferences.java +++ b/mozilla/grendel/sources/grendel/prefs/Preferences.java @@ -131,7 +131,7 @@ public final class Preferences extends XMLPreferences return base_path; } - public static Preferences getPreferances() + public static Preferences getPreferences() { if (preferences == null) { diff --git a/mozilla/grendel/sources/grendel/prefs/accounts/Accounts.java b/mozilla/grendel/sources/grendel/prefs/accounts/Accounts.java index ebf6f4ab378..4ddbb83f09c 100644 --- a/mozilla/grendel/sources/grendel/prefs/accounts/Accounts.java +++ b/mozilla/grendel/sources/grendel/prefs/accounts/Accounts.java @@ -103,7 +103,7 @@ public class Accounts extends XMLPreferences { } } - public List getReciveAccounts() { + public List getReceiveAccounts() { List l = new ArrayList(size()); Collection c = values(); for (Object o: c) { diff --git a/mozilla/grendel/sources/grendel/prefs/accounts/util/SimpleNewAccount.java b/mozilla/grendel/sources/grendel/prefs/accounts/util/SimpleNewAccount.java index d3a6585326d..48692aef920 100644 --- a/mozilla/grendel/sources/grendel/prefs/accounts/util/SimpleNewAccount.java +++ b/mozilla/grendel/sources/grendel/prefs/accounts/util/SimpleNewAccount.java @@ -196,7 +196,7 @@ public class SimpleNewAccount { private Account_SMTP getSMTPServer() { if (acc_name != null) throw new NullPointerException("acc_name"); - List send_accounts = Preferences.getPreferances().getAccounts().getSendAccounts(); + List send_accounts = Preferences.getPreferences().getAccounts().getSendAccounts(); for (Account__Send account: send_accounts) { if (account instanceof Account_SMTP) { Account_SMTP smtp = (Account_SMTP) account; @@ -211,7 +211,7 @@ public class SimpleNewAccount { Account_SMTP smtp = new Account_SMTP(acc_name+"_SMTP"); smtp.setHost(out_host); smtp.setPort(out_port); - Preferences.getPreferances().getAccounts().addAccount(smtp); + Preferences.getPreferences().getAccounts().addAccount(smtp); return smtp; } } diff --git a/mozilla/grendel/sources/grendel/prefs/addressbook/Addressbook__Native.java b/mozilla/grendel/sources/grendel/prefs/addressbook/Addressbook__Native.java index 82b53034303..e91891e2ca2 100644 --- a/mozilla/grendel/sources/grendel/prefs/addressbook/Addressbook__Native.java +++ b/mozilla/grendel/sources/grendel/prefs/addressbook/Addressbook__Native.java @@ -88,7 +88,7 @@ public abstract class Addressbook__Native extends AbstractAddressbook implements public static String getBaseDirectory() { - return Preferences.getPreferances().getProfilePath().concat("/addressbook/"); + return Preferences.getPreferences().getProfilePath().concat("/addressbook/"); } public String getDirectory() diff --git a/mozilla/grendel/sources/grendel/prefs/base/GeneralPrefs.java b/mozilla/grendel/sources/grendel/prefs/base/GeneralPrefs.java index 3e3e4afc755..ddd09f03fea 100644 --- a/mozilla/grendel/sources/grendel/prefs/base/GeneralPrefs.java +++ b/mozilla/grendel/sources/grendel/prefs/base/GeneralPrefs.java @@ -66,12 +66,12 @@ public class GeneralPrefs { } public String getSMTPServer() { - Account_SMTP a = (Account_SMTP) Preferences.getPreferances().getAccounts().getAccount(0); + Account_SMTP a = (Account_SMTP) Preferences.getPreferences().getAccounts().getAccount(0); return a.getHost(); } public void setSMTPServer(String aSMTPServer) { - Account_SMTP a = (Account_SMTP) Preferences.getPreferances().getAccounts().getAccount(0); + Account_SMTP a = (Account_SMTP) Preferences.getPreferences().getAccounts().getAccount(0); a.setHost(aSMTPServer); } diff --git a/mozilla/grendel/sources/grendel/prefs/base/IdentityArray.java b/mozilla/grendel/sources/grendel/prefs/base/IdentityArray.java index f0f7be14c2d..3ddf18fe0b1 100644 --- a/mozilla/grendel/sources/grendel/prefs/base/IdentityArray.java +++ b/mozilla/grendel/sources/grendel/prefs/base/IdentityArray.java @@ -104,9 +104,9 @@ public class IdentityArray { } public IdentityStructure get(int Index) { - Identity id = Preferences.getPreferances().getAccounts().getAccount(0).getIdentity(Index); + Identity id = Preferences.getPreferences().getAccounts().getAccount(0).getIdentity(Index); if (Index<0) Index=0; - if (Index>Preferences.getPreferances().getAccounts().getAccount(0).getIdentities().size()) Index=0; + if (Index>Preferences.getPreferences().getAccounts().getAccount(0).getIdentities().size()) Index=0; if (id == null) { return get(Index +1); } @@ -115,18 +115,18 @@ public class IdentityArray { } public void add(IdentityStructure aIdentity) { - Preferences.getPreferances().getAccounts().getAccount(0).addIdentity(aIdentity.getID()); + Preferences.getPreferences().getAccounts().getAccount(0).addIdentity(aIdentity.getID()); /*if (aIdentity.getParent() == null) { - aIdentity.setParent(XMLPreferences.getPreferances().getAccounts().getAccount(0).getIdentities()); + aIdentity.setParent(XMLPreferences.getPreferences().getAccounts().getAccount(0).getIdentities()); }*/ } public void remove(int Index) { - Preferences.getPreferances().getAccounts().getAccount(0).removeIdentity(Index); + Preferences.getPreferences().getAccounts().getAccount(0).removeIdentity(Index); } public int size() { - int i =Preferences.getPreferances().getAccounts().getAccount(0).getIdentities().size(); + int i =Preferences.getPreferences().getAccounts().getAccount(0).getIdentities().size(); return i; } diff --git a/mozilla/grendel/sources/grendel/prefs/base/ServerArray.java b/mozilla/grendel/sources/grendel/prefs/base/ServerArray.java index eb32994b8c0..5f3ce57f8af 100644 --- a/mozilla/grendel/sources/grendel/prefs/base/ServerArray.java +++ b/mozilla/grendel/sources/grendel/prefs/base/ServerArray.java @@ -86,9 +86,9 @@ public class ServerArray { } public ServerStructure get(int Index) { - Account a = Preferences.getPreferances().getAccounts().getReciveAccounts().get(Index); + Account a = Preferences.getPreferences().getAccounts().getReceiveAccounts().get(Index); if (Index<0) Index=0; - if (Index>Preferences.getPreferances().getAccounts().getReciveAccounts().size()) Index=0; + if (Index>Preferences.getPreferences().getAccounts().getReceiveAccounts().size()) Index=0; if (a == null) { return get(Index +1); } @@ -97,15 +97,15 @@ public class ServerArray { } public void add(ServerStructure aServer) { - Preferences.getPreferances().getAccounts().addAccount(aServer.getAccount()); + Preferences.getPreferences().getAccounts().addAccount(aServer.getAccount()); } public void remove(int Index) { - Preferences.getPreferances().getAccounts().removeAccount(Index); + Preferences.getPreferences().getAccounts().removeAccount(Index); } public int size() { - return Preferences.getPreferances().getAccounts().getReciveAccounts().size(); + return Preferences.getPreferences().getAccounts().getReceiveAccounts().size(); } } diff --git a/mozilla/grendel/sources/grendel/prefs/xml/Test.java b/mozilla/grendel/sources/grendel/prefs/xml/Test.java index b6c6dd75882..c1c8f325bac 100644 --- a/mozilla/grendel/sources/grendel/prefs/xml/Test.java +++ b/mozilla/grendel/sources/grendel/prefs/xml/Test.java @@ -67,7 +67,7 @@ public final class Test { p.setProperty("ui",p_1); p.storeToXML(new FileWriter("C:\\test_1.xml")); System.out.println(p.toString());*/ - /*Accounts accounts = XMLPreferences.getPreferances().getAccounts(); + /*Accounts accounts = XMLPreferences.getPreferences().getAccounts(); accounts.addAccount(new Account_SMTP("Main_SMTP")); accounts.addAccount(new Account_IMAP("Main_IMAP")); accounts.getAccount(1).addIdentity(new Identity("Hash9","hash9@localhost","Main")); @@ -105,8 +105,8 @@ public final class Test { wired.setDefaultIdentity(0); wired.setPassword("tri3i9"); wired.setUsername("hash9");*/ - //XMLPreferences.getPreferances().getAccounts().getAccount(5); - //Preferences.getPreferances().getAccounts().removeAccount(5); + //XMLPreferences.getPreferences().getAccounts().getAccount(5); + //Preferences.getPreferences().getAccounts().removeAccount(5); /*Account_IMAP Server_2 = new Account_IMAP(); Server_2.setName("Server"); Server_2.setHost("192.168.0.100"); @@ -114,7 +114,7 @@ public final class Test { Server_2.setDefaultIdentity(0); Server_2.setPassword("Sig27ma"); Server_2.setUsername("hash9"); - Preferences.getPreferances().getAccounts().addAccount(Server_2);*/ + Preferences.getPreferences().getAccounts().addAccount(Server_2);*/ /*Account_NNTP a = new Account_NNTP("Mozilla Mail/News"); Identity id = new Identity(); id.setEMail("grendel@eternal.undonet.com"); @@ -122,7 +122,7 @@ public final class Test { a.addIdentity(id); a.setHost("news.mozilla.org"); a.setPort(-1); - Preferences.getPreferances().getAccounts().addAccount(a);*/ + Preferences.getPreferences().getAccounts().addAccount(a);*/ Account_IMAP Server_2 = new Account_IMAP(); Server_2.setName("Alt Server"); Server_2.setHost("192.168.0.100"); @@ -130,7 +130,7 @@ public final class Test { Server_2.setDefaultIdentity(0); Server_2.setPassword("Sig27ma"); Server_2.setUsername("hash9"); - Preferences.getPreferances().getAccounts().addAccount(Server_2); + Preferences.getPreferences().getAccounts().addAccount(Server_2); Preferences.save(); } } diff --git a/mozilla/grendel/sources/grendel/renderer/Renderer.java b/mozilla/grendel/sources/grendel/renderer/Renderer.java index da52394f968..68e3be08b41 100755 --- a/mozilla/grendel/sources/grendel/renderer/Renderer.java +++ b/mozilla/grendel/sources/grendel/renderer/Renderer.java @@ -134,9 +134,9 @@ public class Renderer implements Runnable { putBar(buf); Attachment a=makeAttachment(index, p); - buf.append(""); + buf.append("
"); buf.append("
"); - buf.append(HTMLUtils.genHRef("", a.getURL())); + buf.append(HTMLUtils.genHRef("", a.getURL())); buf.append("\n"); if (p.getFileName()!=null) { @@ -231,6 +231,7 @@ public class Renderer implements Runnable { ps.println(""); ps.println(""); ps.println(""); + ps.println("
"); try { ps.println(objectRenderer(message, null, message).toString()); @@ -240,6 +241,7 @@ public class Renderer implements Runnable { e.printStackTrace(ps); } + ps.println("
"); ps.println(""); ps.println(""); ps.close(); @@ -314,7 +316,7 @@ public class Renderer implements Runnable { public void putBar(StringBuilder buf) { if (putbar) { - buf.append("
\n
\n
\n"); + buf.append("
\n
\n
\n"); } else { putbar = true; } diff --git a/mozilla/grendel/sources/grendel/renderer/html/BriefHeaderFormatter.java b/mozilla/grendel/sources/grendel/renderer/html/BriefHeaderFormatter.java index 6723c99d9b1..bd4f0115cdc 100644 --- a/mozilla/grendel/sources/grendel/renderer/html/BriefHeaderFormatter.java +++ b/mozilla/grendel/sources/grendel/renderer/html/BriefHeaderFormatter.java @@ -56,22 +56,22 @@ public class BriefHeaderFormatter extends HeaderFormatter { /** Called when beginning to output a header block. This opens the table. */ void startHeaderOutput(StringBuilder output) { super.startHeaderOutput(output); - output.append(""); + output.append(""); } /** Called when done filling a header block. This closes the table. */ void finishHeaderOutput(StringBuilder output) { - output.append(""); + output.append(""); super.finishHeaderOutput(output); } boolean writeRandomHeader(String header, StringBuilder value, StringBuilder output) { - output.append(""); + output.append(""); return true; } diff --git a/mozilla/grendel/sources/grendel/renderer/html/HTMLUtils.java b/mozilla/grendel/sources/grendel/renderer/html/HTMLUtils.java index aedf2398ece..3e015092cca 100644 --- a/mozilla/grendel/sources/grendel/renderer/html/HTMLUtils.java +++ b/mozilla/grendel/sources/grendel/renderer/html/HTMLUtils.java @@ -142,7 +142,7 @@ public final class HTMLUtils { String strData=buffer.toString(); //strData = strData.replace(" ", " "); - strData=strData.replace("\n", "
"); + strData=strData.replace("\n", "
"); return strData; } diff --git a/mozilla/grendel/sources/grendel/renderer/html/HeaderFormatter.java b/mozilla/grendel/sources/grendel/renderer/html/HeaderFormatter.java index e83ffd59204..287ab2cd0d0 100644 --- a/mozilla/grendel/sources/grendel/renderer/html/HeaderFormatter.java +++ b/mozilla/grendel/sources/grendel/renderer/html/HeaderFormatter.java @@ -54,12 +54,12 @@ abstract class HeaderFormatter { /** Called when beginning to output a header block. This opens the table. */ void startHeaderOutput(StringBuilder output) { - output.append("
"); + output.append(""); output.append(localizeHeaderName(header)); - output.append(": "); + output.append(": "); quoteHTML(value); output.append(value); - output.append("
"); + output.append("
"); } /** Called when done filling a header block. This closes the table. */ void finishHeaderOutput(StringBuilder output) { - output.append("
"); + output.append("
"); } /*************************************************************************/ @@ -208,12 +208,12 @@ abstract class HeaderFormatter { } boolean writeRandomHeader(String header, StringBuilder value, StringBuilder output) { - output.append(""); + output.append(""); output.append(localizeHeaderName(header)); - output.append(": "); + output.append(": "); quoteHTML(value); output.append(value); - output.append(""); + output.append(""); return true; } } diff --git a/mozilla/grendel/sources/grendel/renderer/html/TextHTMLConverter.java b/mozilla/grendel/sources/grendel/renderer/html/TextHTMLConverter.java index e04d5a40d4a..2f68da15a4f 100644 --- a/mozilla/grendel/sources/grendel/renderer/html/TextHTMLConverter.java +++ b/mozilla/grendel/sources/grendel/renderer/html/TextHTMLConverter.java @@ -109,7 +109,7 @@ public class TextHTMLConverter { char url[] = new char[url_length]; text.getChars(i, end, url, 0); - text.insert(i, ""); + text.insert(i, ""); i += 4; in_length += 4; @@ -184,9 +184,9 @@ public class TextHTMLConverter { if (i < in_length && (text.charAt(i) == '>' || text.charAt(i) == ']') && !sendmailFuckage(text, i, in_length)) { - text.insert(i, ""); + text.insert(i, ""); in_length += 6; - text.insert(in_length, "
"); + text.insert(in_length, "
"); } } } diff --git a/mozilla/grendel/sources/grendel/renderer/tools/RenderInputStream.java b/mozilla/grendel/sources/grendel/renderer/tools/RenderInputStream.java index 8fe040023ac..6a148ab1352 100755 --- a/mozilla/grendel/sources/grendel/renderer/tools/RenderInputStream.java +++ b/mozilla/grendel/sources/grendel/renderer/tools/RenderInputStream.java @@ -100,7 +100,7 @@ public class RenderInputStream implements ObjectRender if (p.getContentType().contains("text/")) { //buf.append("
\n
\n
\n"); - buf.append(""); + buf.append("
"); Enumeration enumm=p.getAllHeaders(); @@ -116,7 +116,7 @@ public class RenderInputStream implements ObjectRender } buf.append("
"); - buf.append("
"); + buf.append("
"); buf.append("
"); buf.append("
");
       buf.append(HTMLUtils.quoteToHTML(sw.toString()));
diff --git a/mozilla/grendel/sources/grendel/renderer/tools/RenderMessage.java b/mozilla/grendel/sources/grendel/renderer/tools/RenderMessage.java
index a246e0ea240..d0482913c8b 100755
--- a/mozilla/grendel/sources/grendel/renderer/tools/RenderMessage.java
+++ b/mozilla/grendel/sources/grendel/renderer/tools/RenderMessage.java
@@ -94,7 +94,7 @@ public class RenderMessage implements ObjectRender {
         
         if (indent) {
             buf.append("
");
-            buf.append("");
+            buf.append("
");
             buf.append("
");
         }
         
@@ -111,7 +111,7 @@ public class RenderMessage implements ObjectRender {
         /*new BriefHeaderFormatter().formatHeaders(ih, buf);
         buf.append("
");*/
             new NormalHeaderFormatter().formatHeaders(ih, buf);
-            buf.append("
");
+            buf.append("
");
         /*new FullHeaderFormatter().formatHeaders(ih, buf);
         buf.append("
");*/
         }
diff --git a/mozilla/grendel/sources/grendel/renderer/tools/RenderString.java b/mozilla/grendel/sources/grendel/renderer/tools/RenderString.java
index dde87062771..12a61f25dfa 100755
--- a/mozilla/grendel/sources/grendel/renderer/tools/RenderString.java
+++ b/mozilla/grendel/sources/grendel/renderer/tools/RenderString.java
@@ -44,6 +44,7 @@ package grendel.renderer.tools;
 import grendel.renderer.html.HTMLUtils;
 import grendel.renderer.ObjectRender;
 import grendel.renderer.Renderer;
+import grendel.renderer.html.TextHTMLConverter;
 
 import java.util.Enumeration;
 
@@ -91,7 +92,12 @@ public class RenderString implements ObjectRender
       buf.append(HTMLUtils.cleanHTML((String) o));
     } else if (p.getContentType().contains("text/plain")) {
         master.putBar(buf);
-        buf.append(HTMLUtils.quoteToHTML((String) o));
+        buf.append("
");
+        StringBuilder buffer=new StringBuilder((String) o);
+        TextHTMLConverter.quoteForHTML(buffer, true, true);
+        buf.append(buffer);
+        buf.append("
");
+        //buf.append(HTMLUtils.quoteToHTML((String) o));
     } else {
       try {
         String s=(String) o;
diff --git a/mozilla/grendel/sources/grendel/start.html b/mozilla/grendel/sources/grendel/start.html
index d8cb278c475..ad2ec46e1a9 100755
--- a/mozilla/grendel/sources/grendel/start.html
+++ b/mozilla/grendel/sources/grendel/start.html
@@ -1,119 +1,119 @@
-
-
-
-
-
-Welcome to Mozilla Grendel!
-
-
-
-
-
-
Welcome to Mozilla Grendel

-
-

-
Mozilla Grendel is a open-source Java mail and news client.

-
Features

-
-
More Information

-
-
For product information, visit the Grendel Home Page.

-
-
-
-

-
-
-
-
-
-
+
+
+
+
+
+Welcome to Mozilla Grendel!
+
+
+
+
+
+
Welcome to Mozilla Grendel

+
+

+
Mozilla Grendel is a open-source Java mail and news client.

+
Features

+
+
More Information

+
+
For product information, visit the Grendel Home Page.

+
+
+
+

+
+
+
+
+
+
diff --git a/mozilla/grendel/sources/grendel/structure/Folder.java b/mozilla/grendel/sources/grendel/structure/Folder.java
index 5ea09b9d6e7..632558e4440 100644
--- a/mozilla/grendel/sources/grendel/structure/Folder.java
+++ b/mozilla/grendel/sources/grendel/structure/Folder.java
@@ -338,6 +338,18 @@ public class Folder {
         return name_this.equals(name_that);
     }
     
+    /*
+     * Tests if this folder physically exists on the Server.
+     */
+    public boolean exists() {
+        getServer().ensureConnection();
+        try {
+            return folder.exists();
+        } catch (MessagingException ex) {
+            NoticeBoard.publish(new ExceptionNotice(ex));
+            return false;
+        }
+    }
     
     /**
      * Get the number of unread messages
@@ -695,7 +707,7 @@ public class Folder {
                     boolean found = false;
                     
                     for (int j = 0; j < messages_a.length; j++) {
-                        if (m.equals(messages_a[i])) {
+                        if (m.equals(messages_a[j])) {
                             found = true;
                             j = messages_a.length;
                         }
diff --git a/mozilla/grendel/sources/grendel/structure/Message.java b/mozilla/grendel/sources/grendel/structure/Message.java
index e6a9cdf8d3d..c0d19d9a58d 100644
--- a/mozilla/grendel/sources/grendel/structure/Message.java
+++ b/mozilla/grendel/sources/grendel/structure/Message.java
@@ -467,6 +467,9 @@ public class Message
 
         String message_id_that = list[0];
 
+        if (message_id_this==null) {
+            return false;
+        }
         return message_id_this.equals(message_id_that);
     }
 
@@ -475,6 +478,9 @@ public class Message
         String message_id_this = this.getMessageID();
         String message_id_that = message.getMessageID();
 
+        if (message_id_this==null) {
+            return false;
+        }
         return message_id_this.equals(message_id_that);
     }
 
diff --git a/mozilla/grendel/sources/grendel/structure/Server.java b/mozilla/grendel/sources/grendel/structure/Server.java
index 5b0fdbd5bc8..56ad8f77b54 100644
--- a/mozilla/grendel/sources/grendel/structure/Server.java
+++ b/mozilla/grendel/sources/grendel/structure/Server.java
@@ -71,18 +71,26 @@ public class Server {
             NoticeBoard.publish(new ExceptionNotice(e));
             JOptionPane.showMessageDialog(null,"Login failed", "Grendel Error", JOptionPane.ERROR_MESSAGE);  // TODO REDO THIS!!!!!
             try {
-                store.close();
+                if (store.isConnected()) {
+                    store.close();
+                }
             } catch (MessagingException ex) {
                 ex.printStackTrace();
+            } catch (Exception ex) {
+                ex.printStackTrace();
             }
             return false;
         } catch (MessagingException e) {
             
             NoticeBoard.publish(new ExceptionNotice(e.getNextException()));
             try {
-                store.close();
+                if (store.isConnected()) {
+                    store.close();
+                }
             } catch (MessagingException ex) {
                 ex.printStackTrace();
+            } catch (Exception ex) {
+                ex.printStackTrace();
             }
             return false;
         }
diff --git a/mozilla/grendel/sources/grendel/structure/Servers.java b/mozilla/grendel/sources/grendel/structure/Servers.java
index 9d42343d864..c147e85a050 100644
--- a/mozilla/grendel/sources/grendel/structure/Servers.java
+++ b/mozilla/grendel/sources/grendel/structure/Servers.java
@@ -37,7 +37,7 @@ public final class Servers {
     
     /** Creates a new instance of Servers */
     static {
-        options_mail=Preferences.getPreferances().getPropertyPrefs("options").getPropertyPrefs("mail");
+        options_mail=Preferences.getPreferences().getPropertyPrefs("options").getPropertyPrefs("mail");
     }
     
     public static synchronized List getServers() {
@@ -52,17 +52,17 @@ public final class Servers {
         }
     }
     
-    private static synchronized void updateServers() {        
-        List recive_accounts_list= new ArrayList(Preferences.getPreferances().getAccounts().getReciveAccounts());
+    private static synchronized void updateServers() {
+        List receive_accounts_list= new ArrayList(Preferences.getPreferences().getAccounts().getReceiveAccounts());
         //servers=new Vector(recive_accounts_list.size());
         
         for (Server s: servers) {
-            boolean contains = recive_accounts_list.remove(s.getAccount());
+            boolean contains = receive_accounts_list.remove(s.getAccount());
             if (! contains) {
                 servers.remove(s);
             }
         }
-        for (Account__Receive account : recive_accounts_list) {
+        for (Account__Receive account : receive_accounts_list) {
             try {
                 servers.add(new Server(account));
             } catch (NoSuchProviderException e) {
diff --git a/mozilla/grendel/sources/grendel/structure/test/Main.java b/mozilla/grendel/sources/grendel/structure/test/Main.java
index 533fa39fc4d..655f0768a76 100644
--- a/mozilla/grendel/sources/grendel/structure/test/Main.java
+++ b/mozilla/grendel/sources/grendel/structure/test/Main.java
@@ -111,7 +111,7 @@ public class Main {
         Message m = test.getMessage(1);
         System.out.println("Message 1: " + m.toString());*/
         //echoSigs(netscape);*/
-        //Account__Receive ar = Preferences.getPreferances().getAccounts().getReciveAccounts().get(0);
+        //Account__Receive ar = Preferences.getPreferances().getAccounts().getReceiveAccounts().get(0);
         /*System.out.println("Servers: "+Servers.getServers());
         Server s = Servers.getServers().get(2);
         FolderList fl =s.getRoot().getFolders();
diff --git a/mozilla/grendel/sources/grendel/structure/utill/IdentityUtills.java b/mozilla/grendel/sources/grendel/structure/utill/IdentityUtills.java
index 446eb8bc542..e28acb60ff0 100644
--- a/mozilla/grendel/sources/grendel/structure/utill/IdentityUtills.java
+++ b/mozilla/grendel/sources/grendel/structure/utill/IdentityUtills.java
@@ -31,7 +31,7 @@ public final class IdentityUtills {
     
     public static ArrayList getAllAccountIdentitys() {
         ArrayList ai_a = new ArrayList();
-        List recieve_accounts =  Preferences.getPreferances().getAccounts().getReciveAccounts();
+        List recieve_accounts =  Preferences.getPreferences().getAccounts().getReceiveAccounts();
         for (Account__Receive account: recieve_accounts) {
             Collection identities = account.getCollectionIdentities();
             Account__Send send_account = account.getSendAccount();
diff --git a/mozilla/grendel/sources/grendel/ui/ActionFactory.java b/mozilla/grendel/sources/grendel/ui/ActionFactory.java
index 33e91ca758f..809be5abd5b 100644
--- a/mozilla/grendel/sources/grendel/ui/ActionFactory.java
+++ b/mozilla/grendel/sources/grendel/ui/ActionFactory.java
@@ -29,13 +29,8 @@
 package grendel.ui;
 
 import grendel.ui.addressbook2.Addressbook;
-import java.awt.Component;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
 
 import javax.swing.JFrame;
 import javax.swing.ToolTipManager;
@@ -45,15 +40,9 @@ import grendel.ui.prefs.Identities;
 import grendel.ui.prefs.Servers;
 import grendel.ui.prefs.General;
 import grendel.ui.prefs.UI;
-import grendel.storage.MailDrop;
 import grendel.search.SearchFrame;
-
-/* Temporarily removed because FilterMaster is broken (edwin)
-import grendel.filters.FilterMaster;
-*/
-
-import grendel.composition.Composition;
 import com.trfenv.parsers.Event;
+import grendel.ui.prefs2.PrefsUI;
 
 /**
  *Generates a list of common Grendel events for use across the application.
@@ -78,6 +67,8 @@ public class ActionFactory {
 
   static Runnable fComposeMessageThread = new DummyComposeMessageThread();
 
+    static RunPrefEditor fRunPrefEditor = new RunPrefEditor();
+
   public static ExitAction GetExitAction() {
     return fExitAction;
   }
@@ -140,6 +131,10 @@ public class ActionFactory {
     return fShowAddressBookAction;
   }
 
+  public static RunPrefEditor GetRunPrefEditor() {
+      return fRunPrefEditor;
+  }
+
   /**
    *Returns an array of all the preferences events. Used in windows that
    *don't automatically have the preferences events supplied to them.
@@ -155,6 +150,20 @@ public class ActionFactory {
   }
 }
 
+
+class RunPrefEditor extends Event {
+
+  public RunPrefEditor() {
+    super("prefEditor");
+
+    setEnabled(true);
+  }
+
+
+  public void actionPerformed(ActionEvent aEvent) {
+    new PrefsUI().setVisible(true);
+  }
+}
 class ExitAction extends Event {
 
   public ExitAction() {
diff --git a/mozilla/grendel/sources/grendel/ui/MenuLabels.dtd b/mozilla/grendel/sources/grendel/ui/MenuLabels.dtd
index 39a6b94d5a5..7b537b98439 100644
--- a/mozilla/grendel/sources/grendel/ui/MenuLabels.dtd
+++ b/mozilla/grendel/sources/grendel/ui/MenuLabels.dtd
@@ -191,6 +191,10 @@
 
 
 
+
+
+
+
 
 
 
diff --git a/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java b/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
index d1cf478eb76..f01a20f7a6c 100644
--- a/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
+++ b/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
@@ -24,6 +24,7 @@
 
 package grendel.ui;
 
+import grendel.ui2.FolderView;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
@@ -138,7 +139,7 @@ public class UnifiedMessageDisplayManager extends MessageDisplayManager {
 
 class UnifiedMessageFrame extends GeneralFrame {
   private final boolean DEBUG = false;
-  MasterPanel   fFolders = null;
+  FolderView    fFolders = null;
   FolderPanel   fThreads = null;
   MessagePanel  fMessage = null;
   JSplitPane    splitter1 = null, splitter2 = null;
@@ -160,7 +161,7 @@ class UnifiedMessageFrame extends GeneralFrame {
 
     PrefsDialog.CheckPrefs(this);
 
-    fFolders = new MasterPanel();
+    fFolders = new FolderView();
     fThreads = new FolderPanel();
     fMessage = new MessagePanel();
 
@@ -182,19 +183,19 @@ class UnifiedMessageFrame extends GeneralFrame {
 
     layoutPanels(layout);
 
-    XMLMenuBuilder builder = new XMLMenuBuilder(Util.MergeActions(actions, Util.MergeActions(fFolders.getActions(), Util.MergeActions(fThreads.getActions(), fMessage.getActions()))));
+    XMLMenuBuilder builder = new XMLMenuBuilder(Util.MergeActions(actions, /*Util.MergeActions(fFolders.getActions(),*/ Util.MergeActions(fThreads.getActions(), fMessage.getActions())/*)*/));
     fMenu = builder.buildFrom("ui/grendel.xml", this);
 
     getRootPane().setJMenuBar(fMenu);
 
-    JToolBar masterToolBar = fFolders.getToolBar();
+    //JToolBar masterToolBar = fFolders.getToolBar();
     JToolBar folderToolBar = fThreads.getToolBar();
     JToolBar messageToolBar = fMessage.getToolBar();
 
 
-    fToolBar = Util.MergeToolBars(masterToolBar,
+    fToolBar = /*Util.MergeToolBars(masterToolBar,*/
                              Util.MergeToolBars(folderToolBar,
-                                                messageToolBar));
+                                                messageToolBar)/*)*/;
 
     fToolBarPanelConstraints.fill = GridBagConstraints.HORIZONTAL;
     fToolBarPanelConstraints.anchor = GridBagConstraints.WEST;
@@ -228,7 +229,7 @@ class UnifiedMessageFrame extends GeneralFrame {
     UIPrefs.GetMaster().setMultiPaneLayout(fLayout);
     UIPrefs.GetMaster().writePrefs();
 
-    fFolders.dispose();
+    //fFolders.dispose();
     fThreads.dispose();
     fMessage.dispose();
 
diff --git a/mozilla/grendel/sources/grendel/ui/grendel.xml b/mozilla/grendel/sources/grendel/ui/grendel.xml
index 8dd166f550d..0db1c67834f 100644
--- a/mozilla/grendel/sources/grendel/ui/grendel.xml
+++ b/mozilla/grendel/sources/grendel/ui/grendel.xml
@@ -131,6 +131,8 @@
     
       
       
+      
+      
       
       
       
diff --git a/mozilla/grendel/sources/grendel/ui/prefs2/PrefsTreeTableModel.java b/mozilla/grendel/sources/grendel/ui/prefs2/PrefsTreeTableModel.java
index 495c67f3265..6df67b1a498 100644
--- a/mozilla/grendel/sources/grendel/ui/prefs2/PrefsTreeTableModel.java
+++ b/mozilla/grendel/sources/grendel/ui/prefs2/PrefsTreeTableModel.java
@@ -33,7 +33,7 @@ public class PrefsTreeTableModel extends DefaultTreeTableModel
      * Creates a new instance of PrefsTreeTableModel
      */
     public PrefsTreeTableModel() {
-        this(Preferences.getPreferances());
+        this(Preferences.getPreferences());
     }
     
     public PrefsTreeTableModel(XMLPreferences prefs) {