diff --git a/src/UnicaenZimbra/Processus/BoiteGenerique.php b/src/UnicaenZimbra/Processus/BoiteGenerique.php
index b8aaacaedb4e33812c13b4e8d5dc1ad308e43ce7..50e2043e5dc0669f3ec493e11fbcf103dc5665b5 100644
--- a/src/UnicaenZimbra/Processus/BoiteGenerique.php
+++ b/src/UnicaenZimbra/Processus/BoiteGenerique.php
@@ -70,16 +70,16 @@ class BoiteGenerique extends Processus
     {
         $afName = $this->getMailName( $adresseFonctionnelle );
 
-	// récupération des services
+	// Récupération des services
         $accountService	    = $this->getServiceManager()->get('zimbraServiceAccount');
 	$distribListService = $this->getServiceManager()->get('zimbraServiceDistributionList');
         $folderService	    = $this->getServiceManager()->get('zimbraServiceFolder');
         $filterService	    = $this->getServiceManager()->get('zimbraServiceFilter');
 
         // Travail sur la boite générique
-        $bg = $accountService->get( $mail );
-        $folderService->setAccount($bg );
-        $filterService->setAccount($bg );
+        $bg = $accountService->get($mail);
+        $folderService->setAccount($bg);
+        $filterService->setAccount($bg);
 
         // Liste de distribution
 	$distribList = $distribListService->create($adresseFonctionnelle);
@@ -121,24 +121,27 @@ class BoiteGenerique extends Processus
     {
         $afName = $this->getMailName( $adresseFonctionnelle );
 
+	// récupération des services
         $accountService = $this->getServiceManager()->get('zimbraServiceAccount');
+	$distribListService = $this->getServiceManager()->get('zimbraServiceDistributionList');
         $folderService = $this->getServiceManager()->get('zimbraServiceFolder');
         $filterService = $this->getServiceManager()->get('zimbraServiceFilter');
         
-        /****** Travail sur la boite générique ******/
-        $bg = $accountService->get( $mail );
-        $folderService->setAccount( $bg );
-        $filterService->setAccount( $bg );
+        // Travail sur la boite générique
+        $bg = $accountService->get($mail);
+        $folderService->setAccount($bg);
+        $filterService->setAccount($bg);
 
-        /* Alias */
-        $accountService->removeAlias( $bg, $adresseFonctionnelle );
+	// Liste de distribution
+	$distribListService->delete($distribListService->get($adresseFonctionnelle));
 
-        /* Répertoires */
-        $folderService->delete( $folderService->get($afName.' | Réception') );
-        $folderService->delete( $folderService->get($afName.' | Envoi') );
+        // Répertoires
+        $folderService->delete($folderService->get($afName.' | Réception'));
+        $folderService->delete($folderService->get($afName.' | Envoi'));
 
-        /* Filtres */
+        // Filtres
         $filterService->deleteInput($afName.' | Réception');
+	
         return $this;
     }
 
@@ -231,34 +234,32 @@ class BoiteGenerique extends Processus
     {
         $afName = $this->getMailName( $adresseFonctionnelle );
 
-        $aliasService = $this->getServiceManager()->get('zimbraServiceAlias');
-        $accountService = $this->getServiceManager()->get('zimbraServiceAccount');
-        $folderService = $this->getServiceManager()->get('zimbraServiceFolder');
-        $filterService = $this->getServiceManager()->get('zimbraServiceFilter');
-        $identityService = $this->getServiceManager()->get('zimbraServiceIdentity');
-
-        $alias = $aliasService->get( $adresseFonctionnelle );
+	$distribListService = $this->getServiceManager()->get('zimbraServiceDistributionList'); 
+        $accountService	    = $this->getServiceManager()->get('zimbraServiceAccount');
+        $folderService	    = $this->getServiceManager()->get('zimbraServiceFolder');
+        $filterService	    = $this->getServiceManager()->get('zimbraServiceFilter');
+        $identityService    = $this->getServiceManager()->get('zimbraServiceIdentity');
 
-        /****** Travail sur la boite générique ******/
-        $bgAccount = $accountService->get($alias->zimbraAliasTargetId, 'id');
+	// Travail sur la boite générique
+	$bgAccount = $distribListService->getMembers($adresseFonctionnelle, 1)[0];
         $userAccount = $accountService->get( $userMail );
         $folderService->setAccount($bgAccount);
 
-        /* Suppression des partages */
+        // Suppression des partages
         $inputFolder = $folderService->get($afName.' | Réception');
         $sentFolder = $folderService->get($afName.' | Envoi');
 
         $folderService->revokeGrant( $inputFolder, $userAccount )
                       ->revokeGrant( $sentFolder, $userAccount );
 
-        /****** Travail sur la boite utilisateur ******/
+        // Travail sur la boite utilisateur
         $filterService->setAccount($userAccount);
         $identityService->setAccount($userAccount);
 
-        /* Filtres */
+        // Filtres
         $filterService->deleteOutput($afName.' | Envoi');
 
-        /* Avatar */
+        // Avatar
         $identityService->delete( $identityService->get($afName) );
         return $this;
     }