--- a/src/goodjava/mail/Smtp.java	Sat Mar 06 21:13:34 2021 -0700
+++ b/src/goodjava/mail/Smtp.java	Sun Mar 07 02:22:09 2021 -0700
@@ -6,7 +6,8 @@
 import java.io.OutputStreamWriter;
 import java.io.IOException;
 import java.net.Socket;
-import java.util.Base64;
+import java.util.Map;
+import goodjava.util.GoodUtils;
 
 
 public class Smtp {
@@ -29,6 +30,35 @@
 			throw new SmtpException(ehlo);
 	}
 
+	public String authenticate(String username,String password) throws IOException, SmtpException {
+		String s = "\0" + username + "\0" + password;
+		s = GoodUtils.base64Encode(s);
+		write( "AUTH PLAIN " + s + "\r\n" );
+		String r = read();
+		if( !r.startsWith("235") )
+			throw new SmtpException(r);
+		return r;
+	}
+
+	public void send(Message msg) throws IOException, SmtpException {
+		for( Map.Entry<String,String> entry : msg.headers.entrySet() ) {
+			String name = entry.getKey();
+			String value = entry.getValue();
+			if( name.equalsIgnoreCase("from") ) {
+				from(value);
+			}
+			if( name.equalsIgnoreCase("to")
+				|| name.equalsIgnoreCase("cc")
+				|| name.equalsIgnoreCase("bcc")
+			) {
+				for( String s : value.split(",") ) {
+					to(s);
+				}
+			}
+		}
+		data( msg.toText() );
+	}
+
 	public void close() throws IOException, SmtpException {
 		write( "QUIT\r\n" );
 		String s = read();
@@ -37,16 +67,6 @@
 		socket.close();
 	}
 
-	public String authenticate(String username,String password) throws IOException, SmtpException {
-		String s = "\0" + username + "\0" + password;
-		s = Base64.getEncoder().encodeToString(s.getBytes());
-		write( "AUTH PLAIN " + s + "\r\n" );
-		String r = read();
-		if( !r.startsWith("235") )
-			throw new SmtpException(r);
-		return r;
-	}
-
 	public String from(String address) throws IOException, SmtpException {
 		write( "MAIL FROM: " + address + "\r\n" );
 		String r = read();
@@ -93,11 +113,12 @@
 		Smtp smtp = new Smtp(socket);
 		smtp.authenticate("smtp@luan.software","luanhost");
 		smtp.from("smtp@luan.software");
-		smtp.to("fschmidt@gmail.com");
+		smtp.to(" fschmidt@gmail.com");
 		String text = "\r\n"
-			+"test2\r\n"
+			+"test3\r\n"
 			+".q\r\n"
 			+"x\r\n"
+			+"rg; ;lrg dsl rgj errlgerrg neskrjg skrg rdsg drskrg sd;gr s;kgr skrg skrg sdg ds fg;ks gegr erg ;sg sd; g;sdr gsklrg sg s;kkrg s;hg ;slrg ;elrg ;reg r;g ;r g;er g;ler g;e g; g;r g rg; srkd fjl kj kklsjrg lsk gskdf;rs gkrj glj grekjs lksjgkjn kjslg rklrg ;rsd; kj drsg akrglk kalrgklrsdnrgkgj;r ;s ns b;n;sn ;njslk r;n\r\n"
 		;
 		smtp.data(text);
 		smtp.close();