--- a/src/nabble/model/export/Export.java	Mon Jun 14 15:35:05 2021 -0600
+++ b/src/nabble/model/export/Export.java	Fri Jun 18 17:44:24 2021 -0600
@@ -6,7 +6,6 @@
 import fschmidt.util.mail.MailAddress;
 import fschmidt.util.mail.MailHome;
 import fschmidt.util.mail.PlainTextContent;
-import nabble.model.MailingList;
 import nabble.model.ModelException;
 import nabble.model.ModelHome;
 import nabble.model.Executors;
@@ -50,7 +49,6 @@
 	private final Import imp;
 	private final ExportMessages messages;
 	private final String permalink;
-	private boolean handledMailingList = false;
 	private Set<Long> movedUserIds = new TreeSet<Long>();
 
 	protected Export(Node rootNode,String permalink,String email, ImportServer is, ExportMessages messages)
@@ -126,12 +124,6 @@
 			Node rootNode = this.rootNode.getGoodCopy();
 			long parentId = imp.getNodeId(permalink);
 			export(rootNode.getGoodCopy(),parentId,null);
-			if( handledMailingList ) {
-				handledMailingList = false;
-				export(rootNode.getGoodCopy(),parentId,null);
-				if( handledMailingList )
-					throw new RuntimeException();
-			}
 			// The last step is to delete the old nodes, so there is no reason
 			// to keep this connection open. Let's close it.
 			imp.close();
@@ -178,75 +170,50 @@
 		if( Executors.isShuttingDown() )
 			throw new ShutdownException();
 		long id = node.getExportedNodeId();
-		try {
-			final MailingList ml = node.getMailingList();
-			Integer pinOrder = pin == null || !node.isPinned()? null : ++pin[0];
-			if( id==0L ) {
-				NodeData data = node.getData();
-				data.parentId = parentId;
-				data.pin = pinOrder;
-				String redirectUrl = imp.importNode(data);
-				try {
-					id = imp.getNodeId(redirectUrl);
-				} catch(Import.BadLink e) {
-					logger.error(""+node+" url = "+redirectUrl,e);
-					throw new RuntimeException("redirect url not found: "+redirectUrl);
-				}
-				setExportedNodeId(node, id);
-				if (ml != null) {
-					imp.setExportOwner(id,email);
-					imp.subscribe(id);
-					ml.setExportOwner(email);
-					ml.update();
-					ml.unsubscribe();
-					handledMailingList = true;
-				}
-			} else {
-				if (ml!=null) {
-					imp.setExportOwner(id,null);
-					ml.setExportOwner(null);
-					ml.update();
-				}
+		Integer pinOrder = pin == null || !node.isPinned()? null : ++pin[0];
+		if( id==0L ) {
+			NodeData data = node.getData();
+			data.parentId = parentId;
+			data.pin = pinOrder;
+			String redirectUrl = imp.importNode(data);
+			try {
+				id = imp.getNodeId(redirectUrl);
+			} catch(Import.BadLink e) {
+				logger.error(""+node+" url = "+redirectUrl,e);
+				throw new RuntimeException("redirect url not found: "+redirectUrl);
 			}
-
-			if (ml != null)
-				imp.setMailingList(id);
+			setExportedNodeId(node, id);
+		}
 
-			// Move author
-			Person author = node.getOwner();
-			if (author instanceof User) {
-				User user = (User) author;
-				if (user.isRegistered() && !movedUserIds.contains(user.getId())) {
-					String smallAvatarUrl = null;
-					String bigAvatarUrl = null;
-					if (user.hasAvatar()) {
-						String base = node.getSite().getBaseUrl() + "/file/a" + user.getId() + '/';
-						smallAvatarUrl = base + ModelHome.AVATAR_SMALL;
-						bigAvatarUrl = base + ModelHome.AVATAR_BIG;
-					}
-					imp.addUser(user.getName(), user.getEmail(), user.getPasswordDigest(), user.getRegistered(), smallAvatarUrl, bigAvatarUrl);
-					movedUserIds.add(user.getId());
+		// Move author
+		Person author = node.getOwner();
+		if (author instanceof User) {
+			User user = (User) author;
+			if (user.isRegistered() && !movedUserIds.contains(user.getId())) {
+				String smallAvatarUrl = null;
+				String bigAvatarUrl = null;
+				if (user.hasAvatar()) {
+					String base = node.getSite().getBaseUrl() + "/file/a" + user.getId() + '/';
+					smallAvatarUrl = base + ModelHome.AVATAR_SMALL;
+					bigAvatarUrl = base + ModelHome.AVATAR_BIG;
 				}
+				imp.addUser(user.getName(), user.getEmail(), user.getPasswordDigest(), user.getRegistered(), smallAvatarUrl, bigAvatarUrl);
+				movedUserIds.add(user.getId());
 			}
+		}
 
-			pin = new int[1];
+		pin = new int[1];
 
-			// Here we use an iterator because something may go wrong with the
-			// migration (e.g., the other server may go down or the network may fail)
-			// So we should make sure all DB connections are properly closed.
-			NodeIterator<? extends Node> iterator = node.getChildren();
-			try {
-				while (iterator.hasNext()) {
-					export(iterator.next(), id, pin );
-				}
-			} finally {
-				iterator.close();
+		// Here we use an iterator because something may go wrong with the
+		// migration (e.g., the other server may go down or the network may fail)
+		// So we should make sure all DB connections are properly closed.
+		NodeIterator<? extends Node> iterator = node.getChildren();
+		try {
+			while (iterator.hasNext()) {
+				export(iterator.next(), id, pin );
 			}
-			if (ml != null)
-				imp.setMailingList(null);
-		} catch(ModelException e) {
-			logger.error(""+node,e);
-			throw new RuntimeException(e.toString());
+		} finally {
+			iterator.close();
 		}
 	}