Index: fetchmailconf
===================================================================
RCS file: /home/cvs/debian/fetchmail/fetchmailconf,v
retrieving revision 1.1.1.6
retrieving revision 1.4
diff -u -r1.1.1.6 -r1.4
--- fetchmailconf	2001/03/04 08:33:04	1.1.1.6
+++ fetchmailconf	2001/03/04 08:54:47	1.4
@@ -1448,6 +1448,11 @@
 in multidrop mode.  This complicates
 the configuration issues; see the manual
 page section on multidrop mode.
+
+Warning: Be careful with local names
+such as foo(_at_)bar(_dot_)com, as that can cause
+the mail to be sent to foo(_at_)bar(_dot_)com instead
+of sending it to your local system.
 """}
 
 class UserEdit(Frame, MyWidget):
@@ -1489,8 +1494,19 @@
             self.destruct()
 
     def save(self):
-	self.fetch(User, 'user')
-	self.destruct()
+    	ok = 0
+    	for x in self.user.localnames: ok = ok + (string.find(x, '@') != -1)
+	if ok == 0 or  Dialog(self, 
+	    title = "Really accept an embedded '@' ?",
+            text = "Local names with an embedded '@', such as in foo(_at_)bar " 
+		   "might result in your mail being sent to foo(_at_)bar(_dot_)com "
+		   "instead of your local system.\n Are you sure you want "
+		   "a local user name with an '@' in it?",
+            bitmap = 'question',
+            strings = ('Yes', 'No'),
+            default = 1).num == 0:
+		self.fetch(User, 'user')
+		self.destruct()
 
     def makeWidgets(self, mode, servername):
 	dispose_window(self,