diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in
index b682950032f..2541c320ae6 100644
--- a/mozilla/editor/base/Makefile.in
+++ b/mozilla/editor/base/Makefile.in
@@ -32,10 +32,11 @@ IS_COMPONENT	= 1
 
 CPPSRCS		= \
 		nsEditor.cpp \
-        nsEditorController.cpp \
+		nsEditorController.cpp \
 		nsEditorUtils.cpp \
 		nsEditorRegistration.cpp \
 		nsTextEditRules.cpp \
+		nsHTMLEditUtils.cpp \
 		TextEditorTest.cpp \
 		nsHTMLEditRules.cpp \
 		nsEditorEventListeners.cpp \
diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win
index f171fe8461f..2986be9ced9 100644
--- a/mozilla/editor/base/makefile.win
+++ b/mozilla/editor/base/makefile.win
@@ -32,6 +32,7 @@ CPPSRCS =				\
       nsEditorRegistration.cpp \
       nsTextEditRules.cpp    \
       nsHTMLEditRules.cpp    \
+      nsHTMLEditUtils.cpp    \
       TextEditorTest.cpp     \
       nsEditorEventListeners.cpp   \
       nsEditProperty.cpp     \
diff --git a/mozilla/editor/base/nsHTMLEditUtils.cpp b/mozilla/editor/base/nsHTMLEditUtils.cpp
new file mode 100644
index 00000000000..1943d21235c
--- /dev/null
+++ b/mozilla/editor/base/nsHTMLEditUtils.cpp
@@ -0,0 +1,420 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsHTMLEditUtils.h"
+
+#include "nsString.h"
+#include "nsEditor.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeList.h"
+
+/********************************************************
+ *  helper methods from nsTextEditRules
+ ********************************************************/
+ 
+///////////////////////////////////////////////////////////////////////////
+// IsBody: true if node an html body node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBody(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsBody");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "body")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsBreak: true if node an html break node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBreak(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsBreak");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "br")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMozBR: true if node an html br node with type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsMozBR(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsMozBR");
+  if (IsBreak(node) && HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// HasMozAttr: true if node has type attribute = _moz
+//             (used to indicate the div's and br's we use in
+//              mail compose rules)
+//                  
+PRBool 
+nsHTMLEditUtils::HasMozAttr(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::HasMozAttr");
+  nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(node);
+  if (elem)
+  {
+    nsAutoString typeAttrName("type");
+    nsAutoString typeAttrVal;
+    nsresult res = elem->GetAttribute(typeAttrName, typeAttrVal);
+    typeAttrVal.ToLowerCase();
+    if (NS_SUCCEEDED(res) && (typeAttrVal == "_moz"))
+      return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// InBody: true if node is a descendant of the body
+//                  
+PRBool 
+nsHTMLEditUtils::InBody(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::InBody");
+  nsCOMPtr<nsIDOMNode> tmp;
+  nsCOMPtr<nsIDOMNode> p = do_QueryInterface(node);
+
+  while (p && !IsBody(p))
+  {
+    if ( NS_FAILED(p->GetParentNode(getter_AddRefs(tmp))) || !tmp) // no parent, ran off top of tree
+      return PR_FALSE;
+    p = tmp;
+  }
+  if (p) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+/********************************************************
+ *  helper methods from nsHTMLEditRules
+ ********************************************************/
+ 
+///////////////////////////////////////////////////////////////////////////
+// IsHeader: true if node an html header
+//                  
+PRBool 
+nsHTMLEditUtils::IsHeader(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsHeader");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if ( (tag == "h1") ||
+       (tag == "h2") ||
+       (tag == "h3") ||
+       (tag == "h4") ||
+       (tag == "h5") ||
+       (tag == "h6") )
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsParagraph: true if node an html paragraph
+//                  
+PRBool 
+nsHTMLEditUtils::IsParagraph(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsParagraph");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "p")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsListItem: true if node an html list item
+//                  
+PRBool 
+nsHTMLEditUtils::IsListItem(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsListItem");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "li")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsTableCell: true if node an html td or th
+//                  
+PRBool 
+nsHTMLEditUtils::IsTableRow(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsTableRow");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "tr")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsTableCell: true if node an html td or th
+//                  
+PRBool 
+nsHTMLEditUtils::IsTableCell(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsTableCell");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "td" || tag == "th")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsList: true if node an html list
+//                  
+PRBool 
+nsHTMLEditUtils::IsList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if ( (tag == "ol") ||
+       (tag == "ul") )
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsOrderedList: true if node an html orderd list
+//                  
+PRBool 
+nsHTMLEditUtils::IsOrderedList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsOrderedList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "ol")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsUnorderedList: true if node an html orderd list
+//                  
+PRBool 
+nsHTMLEditUtils::IsUnorderedList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsUnorderedList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "ul")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsBlockquote: true if node an html blockquote node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBlockquote(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsBlockquote");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "blockquote")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsAnchor: true if node an html anchor node
+//                  
+PRBool 
+nsHTMLEditUtils::IsAnchor(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsAnchor");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "a")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsImage: true if node an html image node
+//                  
+PRBool 
+nsHTMLEditUtils::IsImage(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsImage");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "img")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsDiv: true if node an html div node
+//                  
+PRBool 
+nsHTMLEditUtils::IsDiv(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsDiv");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "div")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsNormalDiv: true if node an html div node, without type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsNormalDiv(nsIDOMNode *node)
+{
+  if (IsDiv(node) && !nsHTMLEditUtils::HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMozDiv: true if node an html div node with type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsMozDiv(nsIDOMNode *node)
+{
+  if (IsDiv(node) && HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMailCite: true if node an html blockquote with type=cite
+//                  
+PRBool 
+nsHTMLEditUtils::IsMailCite(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsMailCite");
+  if (IsBlockquote(node))
+  {
+    nsCOMPtr<nsIDOMElement> bqElem = do_QueryInterface(node);
+    nsAutoString typeAttrName("type");
+    nsAutoString typeAttrVal;
+    nsresult res = bqElem->GetAttribute(typeAttrName, typeAttrVal);
+    typeAttrVal.ToLowerCase();
+    if (NS_SUCCEEDED(res))
+    {
+      if (typeAttrVal.Equals("cite", PR_TRUE, 4))
+        return PR_TRUE;
+    }
+  }
+  return PR_FALSE;
+}
+
+
+PRBool 
+nsHTMLEditUtils::IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent) 
+{
+  if (!aNode && !aParent) return PR_FALSE;
+  if (aNode == aParent) return PR_FALSE;
+  
+  nsCOMPtr<nsIDOMNode> parent, node = do_QueryInterface(aNode);
+  nsresult res;
+  
+  do
+  {
+    res = node->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(res)) return PR_FALSE;
+    if (parent.get() == aParent) return PR_TRUE;
+    node = parent;
+  } while (parent);
+  
+  return PR_FALSE;
+}
+
+
+
diff --git a/mozilla/editor/base/nsHTMLEditUtils.h b/mozilla/editor/base/nsHTMLEditUtils.h
new file mode 100644
index 00000000000..94fe1527780
--- /dev/null
+++ b/mozilla/editor/base/nsHTMLEditUtils.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsHTMLEditUtils_h__
+#define nsHTMLEditUtils_h__
+
+#include "prtypes.h"  // for PRBool
+#include "nsError.h"  // for nsresult
+
+class nsIDOMNode;
+
+class nsHTMLEditUtils
+{
+public:
+  // from nsTextEditRules:
+  static PRBool IsBody(nsIDOMNode *aNode);
+  static PRBool IsBreak(nsIDOMNode *aNode);
+  static PRBool IsMozBR(nsIDOMNode *aNode);
+  static PRBool HasMozAttr(nsIDOMNode *aNode);
+  static PRBool InBody(nsIDOMNode *aNode);
+
+  // from nsHTMLEditRules:
+  static PRBool IsHeader(nsIDOMNode *aNode);
+  static PRBool IsParagraph(nsIDOMNode *aNode);
+  static PRBool IsListItem(nsIDOMNode *aNode);
+  static PRBool IsTableRow(nsIDOMNode *aNode);
+  static PRBool IsTableCell(nsIDOMNode *aNode);
+  static PRBool IsList(nsIDOMNode *aNode);
+  static PRBool IsUnorderedList(nsIDOMNode *aNode);
+  static PRBool IsOrderedList(nsIDOMNode *aNode);
+  static PRBool IsBlockquote(nsIDOMNode *aNode);
+  static PRBool IsAnchor(nsIDOMNode *aNode);
+  static PRBool IsImage(nsIDOMNode *aNode);
+  static PRBool IsDiv(nsIDOMNode *aNode);
+  static PRBool IsNormalDiv(nsIDOMNode *aNode);
+  static PRBool IsMozDiv(nsIDOMNode *aNode);
+  static PRBool IsMailCite(nsIDOMNode *aNode);
+  static PRBool IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent);
+};
+
+#endif /* nsHTMLEditUtils_h__ */
+
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp
new file mode 100644
index 00000000000..1943d21235c
--- /dev/null
+++ b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp
@@ -0,0 +1,420 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsHTMLEditUtils.h"
+
+#include "nsString.h"
+#include "nsEditor.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeList.h"
+
+/********************************************************
+ *  helper methods from nsTextEditRules
+ ********************************************************/
+ 
+///////////////////////////////////////////////////////////////////////////
+// IsBody: true if node an html body node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBody(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsBody");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "body")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsBreak: true if node an html break node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBreak(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsBreak");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "br")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMozBR: true if node an html br node with type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsMozBR(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsMozBR");
+  if (IsBreak(node) && HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// HasMozAttr: true if node has type attribute = _moz
+//             (used to indicate the div's and br's we use in
+//              mail compose rules)
+//                  
+PRBool 
+nsHTMLEditUtils::HasMozAttr(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::HasMozAttr");
+  nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(node);
+  if (elem)
+  {
+    nsAutoString typeAttrName("type");
+    nsAutoString typeAttrVal;
+    nsresult res = elem->GetAttribute(typeAttrName, typeAttrVal);
+    typeAttrVal.ToLowerCase();
+    if (NS_SUCCEEDED(res) && (typeAttrVal == "_moz"))
+      return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// InBody: true if node is a descendant of the body
+//                  
+PRBool 
+nsHTMLEditUtils::InBody(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::InBody");
+  nsCOMPtr<nsIDOMNode> tmp;
+  nsCOMPtr<nsIDOMNode> p = do_QueryInterface(node);
+
+  while (p && !IsBody(p))
+  {
+    if ( NS_FAILED(p->GetParentNode(getter_AddRefs(tmp))) || !tmp) // no parent, ran off top of tree
+      return PR_FALSE;
+    p = tmp;
+  }
+  if (p) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+/********************************************************
+ *  helper methods from nsHTMLEditRules
+ ********************************************************/
+ 
+///////////////////////////////////////////////////////////////////////////
+// IsHeader: true if node an html header
+//                  
+PRBool 
+nsHTMLEditUtils::IsHeader(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsHeader");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if ( (tag == "h1") ||
+       (tag == "h2") ||
+       (tag == "h3") ||
+       (tag == "h4") ||
+       (tag == "h5") ||
+       (tag == "h6") )
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsParagraph: true if node an html paragraph
+//                  
+PRBool 
+nsHTMLEditUtils::IsParagraph(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsParagraph");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "p")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsListItem: true if node an html list item
+//                  
+PRBool 
+nsHTMLEditUtils::IsListItem(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsListItem");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "li")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsTableCell: true if node an html td or th
+//                  
+PRBool 
+nsHTMLEditUtils::IsTableRow(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsTableRow");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "tr")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsTableCell: true if node an html td or th
+//                  
+PRBool 
+nsHTMLEditUtils::IsTableCell(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsTableCell");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "td" || tag == "th")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsList: true if node an html list
+//                  
+PRBool 
+nsHTMLEditUtils::IsList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if ( (tag == "ol") ||
+       (tag == "ul") )
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsOrderedList: true if node an html orderd list
+//                  
+PRBool 
+nsHTMLEditUtils::IsOrderedList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsOrderedList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "ol")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsUnorderedList: true if node an html orderd list
+//                  
+PRBool 
+nsHTMLEditUtils::IsUnorderedList(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsUnorderedList");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "ul")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsBlockquote: true if node an html blockquote node
+//                  
+PRBool 
+nsHTMLEditUtils::IsBlockquote(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsBlockquote");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "blockquote")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsAnchor: true if node an html anchor node
+//                  
+PRBool 
+nsHTMLEditUtils::IsAnchor(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsAnchor");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "a")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsImage: true if node an html image node
+//                  
+PRBool 
+nsHTMLEditUtils::IsImage(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null node passed to nsHTMLEditUtils::IsImage");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "img")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsDiv: true if node an html div node
+//                  
+PRBool 
+nsHTMLEditUtils::IsDiv(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsDiv");
+  nsAutoString tag;
+  nsEditor::GetTagString(node,tag);
+  tag.ToLowerCase();
+  if (tag == "div")
+  {
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsNormalDiv: true if node an html div node, without type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsNormalDiv(nsIDOMNode *node)
+{
+  if (IsDiv(node) && !nsHTMLEditUtils::HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMozDiv: true if node an html div node with type = _moz
+//                  
+PRBool 
+nsHTMLEditUtils::IsMozDiv(nsIDOMNode *node)
+{
+  if (IsDiv(node) && HasMozAttr(node)) return PR_TRUE;
+  return PR_FALSE;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////
+// IsMailCite: true if node an html blockquote with type=cite
+//                  
+PRBool 
+nsHTMLEditUtils::IsMailCite(nsIDOMNode *node)
+{
+  NS_PRECONDITION(node, "null parent passed to nsHTMLEditUtils::IsMailCite");
+  if (IsBlockquote(node))
+  {
+    nsCOMPtr<nsIDOMElement> bqElem = do_QueryInterface(node);
+    nsAutoString typeAttrName("type");
+    nsAutoString typeAttrVal;
+    nsresult res = bqElem->GetAttribute(typeAttrName, typeAttrVal);
+    typeAttrVal.ToLowerCase();
+    if (NS_SUCCEEDED(res))
+    {
+      if (typeAttrVal.Equals("cite", PR_TRUE, 4))
+        return PR_TRUE;
+    }
+  }
+  return PR_FALSE;
+}
+
+
+PRBool 
+nsHTMLEditUtils::IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent) 
+{
+  if (!aNode && !aParent) return PR_FALSE;
+  if (aNode == aParent) return PR_FALSE;
+  
+  nsCOMPtr<nsIDOMNode> parent, node = do_QueryInterface(aNode);
+  nsresult res;
+  
+  do
+  {
+    res = node->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(res)) return PR_FALSE;
+    if (parent.get() == aParent) return PR_TRUE;
+    node = parent;
+  } while (parent);
+  
+  return PR_FALSE;
+}
+
+
+
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditUtils.h b/mozilla/editor/libeditor/html/nsHTMLEditUtils.h
new file mode 100644
index 00000000000..94fe1527780
--- /dev/null
+++ b/mozilla/editor/libeditor/html/nsHTMLEditUtils.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsHTMLEditUtils_h__
+#define nsHTMLEditUtils_h__
+
+#include "prtypes.h"  // for PRBool
+#include "nsError.h"  // for nsresult
+
+class nsIDOMNode;
+
+class nsHTMLEditUtils
+{
+public:
+  // from nsTextEditRules:
+  static PRBool IsBody(nsIDOMNode *aNode);
+  static PRBool IsBreak(nsIDOMNode *aNode);
+  static PRBool IsMozBR(nsIDOMNode *aNode);
+  static PRBool HasMozAttr(nsIDOMNode *aNode);
+  static PRBool InBody(nsIDOMNode *aNode);
+
+  // from nsHTMLEditRules:
+  static PRBool IsHeader(nsIDOMNode *aNode);
+  static PRBool IsParagraph(nsIDOMNode *aNode);
+  static PRBool IsListItem(nsIDOMNode *aNode);
+  static PRBool IsTableRow(nsIDOMNode *aNode);
+  static PRBool IsTableCell(nsIDOMNode *aNode);
+  static PRBool IsList(nsIDOMNode *aNode);
+  static PRBool IsUnorderedList(nsIDOMNode *aNode);
+  static PRBool IsOrderedList(nsIDOMNode *aNode);
+  static PRBool IsBlockquote(nsIDOMNode *aNode);
+  static PRBool IsAnchor(nsIDOMNode *aNode);
+  static PRBool IsImage(nsIDOMNode *aNode);
+  static PRBool IsDiv(nsIDOMNode *aNode);
+  static PRBool IsNormalDiv(nsIDOMNode *aNode);
+  static PRBool IsMozDiv(nsIDOMNode *aNode);
+  static PRBool IsMailCite(nsIDOMNode *aNode);
+  static PRBool IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent);
+};
+
+#endif /* nsHTMLEditUtils_h__ */
+