diff --git a/lib/WebGUI/Mailing/Email.pm b/lib/WebGUI/Mailing/Email.pm
index c5fa17f..c925fdb 100644
--- a/lib/WebGUI/Mailing/Email.pm
+++ b/lib/WebGUI/Mailing/Email.pm
@@ -148,11 +148,13 @@ sub transformToText {
     my $self    = shift;
     my $html    = shift;
 
-    my $text = $html;
-    #HTML::Entities::decode($text);
-    $text =~ s/<a.*?href=["'](.*?)['"].*?>(.+?)<\/a>/$2 ($1)/g;
-    $text = WebGUI::HTML::html2text($text);
+#    my $text = $html;
+#    #HTML::Entities::decode($text);
+#    $text =~ s/<a.*?href=["'](.*?)['"].*?>(.+?)<\/a>/$2 ($1)/g;
+#    $text = WebGUI::HTML::html2text($text);
 
+    use HTML::FormatText::WithLinks::AndTables;
+    my $text = HTML::FormatText::WithLinks::AndTables->convert( $html );
     return $text;
 }