diff --git a/ENI2/EditControls/SelectImportClassesDialog.xaml.cs b/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
index a4dbc18c..8f836e8d 100644
--- a/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
+++ b/ENI2/EditControls/SelectImportClassesDialog.xaml.cs
@@ -66,22 +66,21 @@ namespace ENI2.EditControls
                 // these are of no interest
                 if ((aMessage.MessageNotificationClass == Message.NotificationClass.VISIT) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO)) 
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.STO))
                     continue;
 
-                // these are never imported but may be sent
-                if (IsImportMode)
-                {
-                    if ((aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
-                        (aMessage.MessageNotificationClass == Message.NotificationClass.ATD))
-                        continue;
-                }
-                
+                // these are neither imported nor sent by the Send all function
+
+                if ((aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.ATD))
+                    continue;
+
+
                 // filter out messages not relevant for transit
                 if (IsTransit && (
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.ATD) ||
-                    (aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||                    
+                    (aMessage.MessageNotificationClass == Message.NotificationClass.BKRD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.HAZD) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.INFO) ||
                     (aMessage.MessageNotificationClass == Message.NotificationClass.LADG) ||
@@ -100,9 +99,9 @@ namespace ENI2.EditControls
                 sc.IsSelected = this._preselectedClasses.Contains(sc.Class);
                 _selectClasses.Add(sc);
             }
-            
 
-                this.checkListBoxClasses.ItemsSource = _selectClasses;
+
+            this.checkListBoxClasses.ItemsSource = _selectClasses;
             this.OKClicked += SelectImportClassesDialog_OKClicked;
         }
 
@@ -128,7 +127,7 @@ namespace ENI2.EditControls
                     OnPropertyChanged("IsSelected");
                 }
             }
-            
+
             public event PropertyChangedEventHandler PropertyChanged;
             protected void OnPropertyChanged(string propertyName)
             {