diff -Nur --no-dereference e-smith-email-5.6.0.old/createlinks e-smith-email-5.6.0/createlinks
--- e-smith-email-5.6.0.old/createlinks	2022-07-29 22:06:44.023000000 -0400
+++ e-smith-email-5.6.0/createlinks	2022-07-29 22:23:12.338000000 -0400
@@ -27,6 +27,7 @@
 	));
 }
 
+event_link('fetchmail-migrate-fetchids', "bootstrap-console-save", '91');
 # pine-conf
 
 for ( qw(/etc/pine.conf /etc/Muttrc) )
@@ -49,6 +50,7 @@
 $event = "console-save";
 
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy");
+event_link('fetchmail-migrate-fetchids', $event, '91');
 
 #--------------------------------------------------
 # actions for domain-create event:
@@ -72,6 +74,7 @@
 $event = "email-update";
 
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy");
+event_link('fetchmail-migrate-fetchids', $event, '91');
 
 #--------------------------------------------------
 # actions for group-create event:
@@ -122,6 +125,7 @@
 # systemd-specific action mandatory for this package-update event
 event_link("systemd-reload", $event, "89");
 event_link("systemd-default", $event, "88");
+event_link('fetchmail-migrate-fetchids', $event, '91');
 safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/smtp-auth-proxy");
 
 #--------------------------------------------------
diff -Nur --no-dereference e-smith-email-5.6.0.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids e-smith-email-5.6.0/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids
--- e-smith-email-5.6.0.old/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-email-5.6.0/root/etc/e-smith/events/actions/fetchmail-migrate-fetchids	2022-07-29 22:17:09.306000000 -0400
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+my $original_file = "/run/lock/fetchmail/.fetchids";
+my $new_file = "/var/lib/fetchmail/.fetchids";
+
+exit 0 if ( -f $new_file ) ;
+exit 0 unless ( -f $original_file ) ;
+while ( -f /run/lock/fetchmail/fetchmail.pid ) {
+  print "waiting for fetchmail to finish";
+  sleep 10;
+}
+
+system("/usr/bin/mv $original_file $new_file") == 0 or warn "The move $original_file to $new_file operation failed: $!";
diff -Nur --no-dereference e-smith-email-5.6.0.old/root/etc/e-smith/templates/etc/fetchmail/50multi-drop e-smith-email-5.6.0/root/etc/e-smith/templates/etc/fetchmail/50multi-drop
--- e-smith-email-5.6.0.old/root/etc/e-smith/templates/etc/fetchmail/50multi-drop	2016-02-04 18:52:20.000000000 -0500
+++ e-smith-email-5.6.0/root/etc/e-smith/templates/etc/fetchmail/50multi-drop	2022-07-29 22:15:05.227000000 -0400
@@ -41,6 +41,7 @@
 	$OUT .= "retrieves all mail from a remote POP mailbox:\n";
 	$OUT .= "\n";
 	$OUT .= "/usr/bin/fetchmail --syslog $verbosity ";
+        $OUT .= " -i /var/lib/fetchmail/.fetchids "; # fix SME: 11979/12131
 
 	my $AuthenticationMethod =
 	    $fetchmail{"AuthenticationMethod"}