282,284c282,290
<   elseif (db_fetch_object(db_query("SELECT * FROM {mailing_list_emails} WHERE mlid = %d AND mail = '%s'", $form_state['values']['mlid'], $form_state['values']['mail']))) {
<     form_set_error('mail', t('The e-mail %mail already exists in mailing list %name.', array('%mail' => $form_state['values']['mail'], '%name' => $form_state['values']['ml_name'])));
<   }
---
>   else{
>     if(isset($form_state['values']['eid'])) {
> 	  if (!db_fetch_object(db_query("SELECT * FROM {mailing_list_emails} WHERE mlid = %d AND eid = %d", $form_state['values']['mlid'], $form_state['values']['eid']))) {
>         form_set_error(NULL, t('You seem to be trying to edit a non-existent entry'));
>       }
>     } elseif (db_fetch_object(db_query("SELECT * FROM {mailing_list_emails} WHERE mlid = %d AND mail = '%s'", $form_state['values']['mlid'], $form_state['values']['mail']))) {
>       form_set_error('mail', t('The e-mail %mail already exists in mailing list %name.', array('%mail' => $form_state['values']['mail'], '%name' => $form_state['values']['ml_name'])));
>     }		
>   }