Change to .net standard capitalization rules in several places.
authorDean
Thu, 06 Oct 2016 19:44:58 +0200
changeset 1348c394606d6f6c
parent 1347 b374b67e6dd2
child 1349 77c31d9ef5a6
Change to .net standard capitalization rules in several places.
This now matches the adapter but has several differences from Outlook naming.
CryptableMailItem.cs
MailItemExtensions.cs
MsgProcessor.cs
PEPIdentity.cs
PEPMessage.cs
PEPSettings.cs
ThisAddIn.cs
UI/FormControlOptions.xaml
UI/FormControlOptions.xaml.cs
UI/FormRegionPreviewUnencrypted.cs
UI/FormRegionPrivacyStatus.cs
     1.1 --- a/CryptableMailItem.cs	Wed Oct 05 23:58:06 2016 +0200
     1.2 +++ b/CryptableMailItem.cs	Thu Oct 06 19:44:58 2016 +0200
     1.3 @@ -264,7 +264,7 @@
     1.4          /// This forwards the call to the internal mail item.
     1.5          /// See: https://msdn.microsoft.com/en-us/library/office/ff867895.aspx
     1.6          /// </summary>
     1.7 -        public string ConversationID
     1.8 +        public string ConversationId
     1.9          {
    1.10              get
    1.11              {
    1.12 @@ -628,7 +628,7 @@
    1.13          }
    1.14  
    1.15          /// <summary>
    1.16 -        /// Gets the pEp identities for the "To", "CC", "BCC" and/or "originator" in the cryptable mail item as one list.
    1.17 +        /// Gets the pEp identities for the "To", "Cc", "Bcc" and/or "originator" in the cryptable mail item as one list.
    1.18          /// If a failure occurs during identity creation, that identity will not be in the resulting list.
    1.19          /// Warning: This can contain identity groups.
    1.20          /// </summary>
    1.21 @@ -707,7 +707,7 @@
    1.22                  bool specialCaseFound = false;
    1.23                  bool entryIDWasAdded = false;
    1.24                  bool mirrorCreated = false;
    1.25 -                string entryID = this.internalMailItem.EntryID;
    1.26 +                string entryId = this.internalMailItem.EntryID;
    1.27                  object propValue;
    1.28                  Outlook.MailItem mirrorMailItem = null;
    1.29                  Outlook.MailItem mailItem;
    1.30 @@ -727,7 +727,7 @@
    1.31                  isDraft = this.internalMailItem.GetIsDraft();
    1.32  
    1.33                  // Make sure this mailitem is not already being decrypted
    1.34 -                if (string.IsNullOrEmpty(entryID) == false)
    1.35 +                if (string.IsNullOrEmpty(entryId) == false)
    1.36                  {
    1.37                      do
    1.38                      {
    1.39 @@ -737,7 +737,7 @@
    1.40                           */
    1.41                          lock (mutexDecrytionList)
    1.42                          {
    1.43 -                            if (decryptionList.ContainsKey(entryID))
    1.44 +                            if (decryptionList.ContainsKey(entryId))
    1.45                              {
    1.46                                  isAlreadyBeingDecrypted = true;
    1.47                              }
    1.48 @@ -755,9 +755,9 @@
    1.49                               */
    1.50                              if (isAlreadyBeingDecrypted == false)
    1.51                              {
    1.52 -                                decryptionList.Add(entryID, "");
    1.53 +                                decryptionList.Add(entryId, "");
    1.54                                  entryIDWasAdded = true;
    1.55 -                                Log.Verbose("ProcessAndGetRating: Added EntryID to decryption list. " + entryID);
    1.56 +                                Log.Verbose("ProcessAndGetRating: Added EntryID to decryption list. " + entryId);
    1.57                                  Log.Verbose("ProcessAndGetRating: Active decryption count = " + decryptionList.Count.ToString());
    1.58                                  break;
    1.59                              }
    1.60 @@ -766,7 +766,7 @@
    1.61                          // Wait for the other thread to finish
    1.62                          if (isAlreadyBeingDecrypted)
    1.63                          {
    1.64 -                            Log.Verbose("ProcessAndGetRating: Waiting for other decryption thread to finish. " + entryID);
    1.65 +                            Log.Verbose("ProcessAndGetRating: Waiting for other decryption thread to finish. " + entryId);
    1.66                              Thread.Sleep(sleepTime);
    1.67                              curWaitTime += sleepTime;
    1.68                          }
    1.69 @@ -790,7 +790,7 @@
    1.70                  if ((isAlreadyBeingDecrypted) ||
    1.71                      (curWaitTime >= maxWaitTime))
    1.72                  {
    1.73 -                    Log.Error("ProcessAndGetRating: Exited by timeout. " + (string.IsNullOrEmpty(entryID) ? "<no ID>" : entryID));
    1.74 +                    Log.Error("ProcessAndGetRating: Exited by timeout. " + (string.IsNullOrEmpty(entryId) ? "<no ID>" : entryId));
    1.75                      return (pEpRating.pEpRatingCannotDecrypt);
    1.76                  }
    1.77  
    1.78 @@ -938,9 +938,9 @@
    1.79                      {
    1.80                          try
    1.81                          {
    1.82 -                            decryptionList.Remove(entryID);
    1.83 +                            decryptionList.Remove(entryId);
    1.84                              Log.Verbose("ProcessAndGetRating: Removed EntryID from decryption list. " +
    1.85 -                                        (string.IsNullOrEmpty(entryID) ? "<no ID>" : entryID));
    1.86 +                                        (string.IsNullOrEmpty(entryId) ? "<no ID>" : entryId));
    1.87                          }
    1.88                          catch
    1.89                          {
    1.90 @@ -1178,8 +1178,8 @@
    1.91          {
    1.92              bool isEncrypted = false;
    1.93              bool itemAdded = false;
    1.94 -            string entryID = null;
    1.95 -            string id = this.ConversationID;
    1.96 +            string entryId = null;
    1.97 +            string id = this.ConversationId;
    1.98              string index = this.ConversationIndex;
    1.99              string topic = this.ConversationTopic;
   1.100              OriginalMailItem encOriginal;
   1.101 @@ -1188,7 +1188,7 @@
   1.102              {
   1.103                  lock (mutexMailItem)
   1.104                  {
   1.105 -                    entryID = this.internalMailItem.EntryID;
   1.106 +                    entryId = this.internalMailItem.EntryID;
   1.107  
   1.108                      if (this.lastProcessedRating >= pEpRating.pEpRatingUnencryptedForSome)
   1.109                      {
   1.110 @@ -1196,21 +1196,21 @@
   1.111                      }
   1.112                  }
   1.113  
   1.114 -                // Note: ConversationID can be null on a mirror (you cannot set it manually)
   1.115 +                // Note: ConversationId can be null on a mirror (you cannot set it manually)
   1.116                  // Therefore, it is ignored from the check here but stored anyway.
   1.117                  // It is not currently used in subsequent processing though.
   1.118                  if ((isEncrypted) &&
   1.119 -                    (string.IsNullOrEmpty(entryID) == false) &&
   1.120 +                    (string.IsNullOrEmpty(entryId) == false) &&
   1.121                      (string.IsNullOrEmpty(index) == false) &&
   1.122                      (string.IsNullOrEmpty(topic) == false))
   1.123                  {
   1.124                      lock (mutexConversation)
   1.125                      {
   1.126                          encOriginal = new OriginalMailItem();
   1.127 -                        encOriginal.ConversationID = id;
   1.128 +                        encOriginal.ConversationId = id;
   1.129                          encOriginal.ConversationIndex = index;
   1.130                          encOriginal.ConversationTopic = topic;
   1.131 -                        encOriginal.EntryID = entryID;
   1.132 +                        encOriginal.EntryId = entryId;
   1.133                          encOriginal.IsEncrypted = true;
   1.134  
   1.135                          conversationCache.Add(encOriginal);
   1.136 @@ -1247,7 +1247,7 @@
   1.137          public bool SetIsOriginallyEncryptedByCache()
   1.138          {
   1.139              bool isEncrypted = false;
   1.140 -            string entryID = null;
   1.141 +            string entryId = null;
   1.142              string index = this.ConversationIndex;
   1.143              string topic = this.ConversationTopic;
   1.144  
   1.145 @@ -1255,7 +1255,7 @@
   1.146              {
   1.147                  lock (mutexMailItem)
   1.148                  {
   1.149 -                    entryID = this.internalMailItem.EntryID;
   1.150 +                    entryId = this.internalMailItem.EntryID;
   1.151                  }
   1.152  
   1.153                  if ((string.IsNullOrEmpty(index) == false) &&
   1.154 @@ -1270,10 +1270,10 @@
   1.155                               * Note: Conversation index is unreliable and therefore not used in the comparison.
   1.156                               * Therefore, timing of the method is somewhat important.
   1.157                               */
   1.158 -                            if (((entryID == null) ||
   1.159 -                                 ((entryID != null) &&
   1.160 -                                  (conversationCache[i].EntryID != null) &&
   1.161 -                                  (entryID != conversationCache[i].EntryID))) &&
   1.162 +                            if (((entryId == null) ||
   1.163 +                                 ((entryId != null) &&
   1.164 +                                  (conversationCache[i].EntryId != null) &&
   1.165 +                                  (entryId != conversationCache[i].EntryId))) &&
   1.166                                  (topic.Equals(conversationCache[i].ConversationTopic, StringComparison.OrdinalIgnoreCase)))
   1.167                              {
   1.168                                  isEncrypted = true;
   1.169 @@ -1823,18 +1823,18 @@
   1.170          /// </summary>
   1.171          private class OriginalMailItem
   1.172          {
   1.173 -            public string ConversationID { get; set; }
   1.174 +            public string ConversationId { get; set; }
   1.175              public string ConversationIndex { get; set; }
   1.176              public string ConversationTopic { get; set; }
   1.177 -            public string EntryID { get; set; }
   1.178 +            public string EntryId { get; set; }
   1.179              public bool IsEncrypted { get; set; }
   1.180  
   1.181              public OriginalMailItem()
   1.182              {
   1.183 -                this.ConversationID = null;
   1.184 +                this.ConversationId = null;
   1.185                  this.ConversationIndex = null;
   1.186                  this.ConversationTopic = null;
   1.187 -                this.EntryID = null;
   1.188 +                this.EntryId = null;
   1.189                  this.IsEncrypted = false;
   1.190              }
   1.191          }
     2.1 --- a/MailItemExtensions.cs	Wed Oct 05 23:58:06 2016 +0200
     2.2 +++ b/MailItemExtensions.cs	Thu Oct 06 19:44:58 2016 +0200
     2.3 @@ -306,8 +306,8 @@
     2.4                  {
     2.5                      for (int i = 0; i < Globals.ThisAddIn.Settings.AccountSettingsList.Count; i++)
     2.6                      {
     2.7 -                        if ((Globals.ThisAddIn.Settings.AccountSettingsList[i].SentFolderEntryID != null) &&
     2.8 -                            (folderLevelOneEntryId == Globals.ThisAddIn.Settings.AccountSettingsList[i].SentFolderEntryID))
     2.9 +                        if ((Globals.ThisAddIn.Settings.AccountSettingsList[i].SentFolderEntryId != null) &&
    2.10 +                            (folderLevelOneEntryId == Globals.ThisAddIn.Settings.AccountSettingsList[i].SentFolderEntryId))
    2.11                          {
    2.12                              result = true;
    2.13                              break;
    2.14 @@ -397,21 +397,21 @@
    2.15  
    2.16          /// <summary>
    2.17          /// Gets the pEp store folder used to store the mirror for the given Outlook mail item.
    2.18 -        /// This will be determined based on the from username.
    2.19 -        /// The UNKNOWN_SENDER folder is used if a failure occurs in finding the from username.
    2.20 +        /// This will be determined based on the from user name.
    2.21 +        /// The UNKNOWN_SENDER folder is used if a failure occurs in finding the from user name.
    2.22          /// </summary>
    2.23          /// <param name="omi">The outlook mail item to process with.</param>
    2.24          /// <returns>The outlook folder to store the mirror of the given mail item.</returns>
    2.25          public static Outlook.Folder GetMirrorFolder(this Outlook.MailItem omi)
    2.26          {
    2.27 -            string username;
    2.28 +            string userName;
    2.29              string[] specialChars;
    2.30              Outlook.Folder folder;
    2.31              Outlook.Folders folders = Globals.ThisAddIn.PEPStoreRootFolder.Folders;
    2.32              Globals.ReturnStatus sts;
    2.33              StringBuilder strBuilder = new StringBuilder();
    2.34  
    2.35 -            sts = PEPIdentity.GetFromUsername(omi, out username);
    2.36 +            sts = PEPIdentity.GetFromUserName(omi, out userName);
    2.37  
    2.38              if (sts == Globals.ReturnStatus.Success)
    2.39              {
    2.40 @@ -419,35 +419,35 @@
    2.41                   * See: https://msdn.microsoft.com/en-us/library/aa493942(v=exchg.80).aspx
    2.42                   */
    2.43                  specialChars = new string[] { "[", "]", "/", "\\", "&", "~", "?", "*", "|", "<", ">", "\"", ";", ":", "+" };
    2.44 -                if (username != null)
    2.45 +                if (userName != null)
    2.46                  {
    2.47 -                    strBuilder.Append(username);
    2.48 +                    strBuilder.Append(userName);
    2.49                      for (int i = 0; i < specialChars.Length; i++)
    2.50                      {
    2.51                          strBuilder.Replace(specialChars[i], "");
    2.52                      }
    2.53 -                    username = strBuilder.ToString();
    2.54 +                    userName = strBuilder.ToString();
    2.55                  }
    2.56  
    2.57                  // Use unknown if invalid
    2.58 -                if (string.IsNullOrWhiteSpace(username))
    2.59 +                if (string.IsNullOrWhiteSpace(userName))
    2.60                  {
    2.61 -                    username = CryptableMailItem.UNKNOWN_SENDER;
    2.62 +                    userName = CryptableMailItem.UNKNOWN_SENDER;
    2.63                  }
    2.64              }
    2.65              else
    2.66              {
    2.67 -                username = CryptableMailItem.UNKNOWN_SENDER;
    2.68 +                userName = CryptableMailItem.UNKNOWN_SENDER;
    2.69              }
    2.70  
    2.71              try
    2.72              {
    2.73 -                folder = (Outlook.Folder)folders[username];
    2.74 +                folder = (Outlook.Folder)folders[userName];
    2.75                  Log.Verbose("GetUnencryptedFolder: Using existing folder.");
    2.76              }
    2.77              catch
    2.78              {
    2.79 -                folder = (Outlook.Folder)folders.Add(username);
    2.80 +                folder = (Outlook.Folder)folders.Add(userName);
    2.81                  Log.Verbose("GetUnencryptedFolder: Creating new folder.");
    2.82              }
    2.83  
     3.1 --- a/MsgProcessor.cs	Wed Oct 05 23:58:06 2016 +0200
     3.2 +++ b/MsgProcessor.cs	Thu Oct 06 19:44:58 2016 +0200
     3.3 @@ -538,7 +538,7 @@
     3.4  
     3.5          /// <summary>
     3.6          /// Processes the given PEP message mail item before sending.
     3.7 -        /// This will handle things like distribution lists, encryption, BCC, etc.
     3.8 +        /// This will handle things like distribution lists, encryption, Bcc, etc.
     3.9          /// </summary>
    3.10          /// <param name="message">The original PEP message being sent.</param>
    3.11          /// <param name="isInSecureStore">Whether the PEP message being sent is in a secure (untrusted) store.</param>
    3.12 @@ -589,7 +589,7 @@
    3.13  
    3.14          /// <summary>
    3.15          /// Processes the given PEP message mail item before sending.
    3.16 -        /// This will handle things like distribution lists, encryption, BCC, etc.
    3.17 +        /// This will handle things like distribution lists, encryption, Bcc, etc.
    3.18          /// </summary>
    3.19          /// <param name="message">The original PEP message being sent.</param>
    3.20          /// <param name="isInEncryptedStore">Whether the PEP message being sent is in an
    3.21 @@ -657,61 +657,61 @@
    3.22  
    3.23              Log.Verbose("ProcessSentMessage: Processing send unencrypted by identity.");
    3.24  
    3.25 -            // BCC
    3.26 -            for (int i = 0; i < workingMessage.BCC.Count; i++)
    3.27 +            // Bcc
    3.28 +            for (int i = 0; i < workingMessage.Bcc.Count; i++)
    3.29              {
    3.30 -                if (workingMessage.BCC[i].IsForceUnencryptedBool)
    3.31 +                if (workingMessage.Bcc[i].IsForceUnencryptedBool)
    3.32                  {
    3.33                      if (newUnencryptedMessage == null)
    3.34                      {
    3.35                          newUnencryptedMessage = workingMessage.Copy();
    3.36 -                        newUnencryptedMessage.BCC.Clear();
    3.37 -                        newUnencryptedMessage.CC.Clear();
    3.38 +                        newUnencryptedMessage.Bcc.Clear();
    3.39 +                        newUnencryptedMessage.Cc.Clear();
    3.40                          newUnencryptedMessage.To.Clear();
    3.41                      }
    3.42  
    3.43 -                    newUnencryptedMessage.BCC.Add(workingMessage.BCC[i].Copy());
    3.44 +                    newUnencryptedMessage.Bcc.Add(workingMessage.Bcc[i].Copy());
    3.45                  }
    3.46                  else
    3.47                  {
    3.48                      if (newEncryptedMessage == null)
    3.49                      {
    3.50                          newEncryptedMessage = workingMessage.Copy();
    3.51 -                        newEncryptedMessage.BCC.Clear();
    3.52 -                        newEncryptedMessage.CC.Clear();
    3.53 +                        newEncryptedMessage.Bcc.Clear();
    3.54 +                        newEncryptedMessage.Cc.Clear();
    3.55                          newEncryptedMessage.To.Clear();
    3.56                      }
    3.57  
    3.58 -                    newEncryptedMessage.BCC.Add(workingMessage.BCC[i].Copy());
    3.59 +                    newEncryptedMessage.Bcc.Add(workingMessage.Bcc[i].Copy());
    3.60                  }
    3.61              }
    3.62  
    3.63              // CC
    3.64 -            for (int i = 0; i < workingMessage.CC.Count; i++)
    3.65 +            for (int i = 0; i < workingMessage.Cc.Count; i++)
    3.66              {
    3.67 -                if (workingMessage.CC[i].IsForceUnencryptedBool)
    3.68 +                if (workingMessage.Cc[i].IsForceUnencryptedBool)
    3.69                  {
    3.70                      if (newUnencryptedMessage == null)
    3.71                      {
    3.72                          newUnencryptedMessage = workingMessage.Copy();
    3.73 -                        newUnencryptedMessage.BCC.Clear();
    3.74 -                        newUnencryptedMessage.CC.Clear();
    3.75 +                        newUnencryptedMessage.Bcc.Clear();
    3.76 +                        newUnencryptedMessage.Cc.Clear();
    3.77                          newUnencryptedMessage.To.Clear();
    3.78                      }
    3.79  
    3.80 -                    newUnencryptedMessage.CC.Add(workingMessage.CC[i].Copy());
    3.81 +                    newUnencryptedMessage.Cc.Add(workingMessage.Cc[i].Copy());
    3.82                  }
    3.83                  else
    3.84                  {
    3.85                      if (newEncryptedMessage == null)
    3.86                      {
    3.87                          newEncryptedMessage = workingMessage.Copy();
    3.88 -                        newEncryptedMessage.BCC.Clear();
    3.89 -                        newEncryptedMessage.CC.Clear();
    3.90 +                        newEncryptedMessage.Bcc.Clear();
    3.91 +                        newEncryptedMessage.Cc.Clear();
    3.92                          newEncryptedMessage.To.Clear();
    3.93                      }
    3.94  
    3.95 -                    newEncryptedMessage.CC.Add(workingMessage.CC[i].Copy());
    3.96 +                    newEncryptedMessage.Cc.Add(workingMessage.Cc[i].Copy());
    3.97                  }
    3.98              }
    3.99  
   3.100 @@ -723,8 +723,8 @@
   3.101                      if (newUnencryptedMessage == null)
   3.102                      {
   3.103                          newUnencryptedMessage = workingMessage.Copy();
   3.104 -                        newUnencryptedMessage.BCC.Clear();
   3.105 -                        newUnencryptedMessage.CC.Clear();
   3.106 +                        newUnencryptedMessage.Bcc.Clear();
   3.107 +                        newUnencryptedMessage.Cc.Clear();
   3.108                          newUnencryptedMessage.To.Clear();
   3.109                      }
   3.110  
   3.111 @@ -735,8 +735,8 @@
   3.112                      if (newEncryptedMessage == null)
   3.113                      {
   3.114                          newEncryptedMessage = workingMessage.Copy();
   3.115 -                        newEncryptedMessage.BCC.Clear();
   3.116 -                        newEncryptedMessage.CC.Clear();
   3.117 +                        newEncryptedMessage.Bcc.Clear();
   3.118 +                        newEncryptedMessage.Cc.Clear();
   3.119                          newEncryptedMessage.To.Clear();
   3.120                      }
   3.121  
   3.122 @@ -755,17 +755,17 @@
   3.123              }
   3.124  
   3.125              ///////////////////////////////////////////////////////////
   3.126 -            // Handle BCC
   3.127 +            // Handle Bcc
   3.128              //  This uses the encrypted messages
   3.129              ///////////////////////////////////////////////////////////
   3.130  
   3.131 -            Log.Verbose("ProcessSentMessage: Processing BCC");
   3.132 +            Log.Verbose("ProcessSentMessage: Processing Bcc");
   3.133  
   3.134 -            // Remove any encrypted messages with BCC for special processing
   3.135 +            // Remove any encrypted messages with Bcc for special processing
   3.136              for (int i = 0; i < encryptedMessages.Count; i++)
   3.137              {
   3.138 -                if ((encryptedMessages[i].BCC != null) &&
   3.139 -                    (encryptedMessages[i].BCC.Count > 0))
   3.140 +                if ((encryptedMessages[i].Bcc != null) &&
   3.141 +                    (encryptedMessages[i].Bcc.Count > 0))
   3.142                  {
   3.143                      bccMessages.Add(encryptedMessages[i]);
   3.144                      encryptedMessages.RemoveAt(i);
   3.145 @@ -775,25 +775,25 @@
   3.146                  }
   3.147              }
   3.148  
   3.149 -            // Process the BCC messages
   3.150 +            // Process the Bcc messages
   3.151              for (int i = 0; i < bccMessages.Count; i++)
   3.152              {
   3.153 -                // First, add message without BCC
   3.154 -                if ((bccMessages[i].CC.Count > 0) ||
   3.155 +                // First, add message without Bcc
   3.156 +                if ((bccMessages[i].Cc.Count > 0) ||
   3.157                      (bccMessages[i].To.Count > 0))
   3.158                  {
   3.159                      newMessage = bccMessages[i].Copy();
   3.160 -                    newMessage.BCC.Clear();
   3.161 +                    newMessage.Bcc.Clear();
   3.162                      encryptedMessages.Add(newMessage);
   3.163                  }
   3.164  
   3.165 -                // Second, check each BCC to see if it will receive an encrypted copy
   3.166 -                for (int j = 0; j < bccMessages[i].BCC.Count; j++)
   3.167 +                // Second, check each Bcc to see if it will receive an encrypted copy
   3.168 +                for (int j = 0; j < bccMessages[i].Bcc.Count; j++)
   3.169                  {
   3.170                      newMessage = new PEPMessage();
   3.171                      newMessage.Direction = pEpMsgDirection.pEpDirOutgoing;
   3.172                      newMessage.From = bccMessages[i].From.Copy();
   3.173 -                    newMessage.To.Add(bccMessages[i].BCC[j].Copy());
   3.174 +                    newMessage.To.Add(bccMessages[i].Bcc[j].Copy());
   3.175  
   3.176                      // Calculate outgoing rating
   3.177                      outgoingRating = this.GetOutgoingRating(newMessage);
   3.178 @@ -801,29 +801,29 @@
   3.179                      // Group identities
   3.180                      if (outgoingRating >= pEpRating.pEpRatingReliable)
   3.181                      {
   3.182 -                        bccEncryptedGroup.Add(bccMessages[i].BCC[j].Copy());
   3.183 +                        bccEncryptedGroup.Add(bccMessages[i].Bcc[j].Copy());
   3.184                      }
   3.185                      else
   3.186                      {
   3.187 -                        bccUnencryptedGroup.Add(bccMessages[i].BCC[j].Copy());
   3.188 +                        bccUnencryptedGroup.Add(bccMessages[i].Bcc[j].Copy());
   3.189                      }
   3.190                  }
   3.191  
   3.192 -                // Third, create individual mail items for encrypted BCC
   3.193 +                // Third, create individual mail items for encrypted Bcc
   3.194                  for (int j = 0; j < bccEncryptedGroup.Count; j++)
   3.195                  {
   3.196 -                    // New mail for each encrypted BCC recipient
   3.197 +                    // New mail for each encrypted Bcc recipient
   3.198                      newMessage = bccMessages[i].Copy();
   3.199 -                    newMessage.BCC.Clear();
   3.200 -                    newMessage.CC.Clear();
   3.201 +                    newMessage.Bcc.Clear();
   3.202 +                    newMessage.Cc.Clear();
   3.203                      newMessage.To.Clear();
   3.204  
   3.205 -                    newMessage.BCC.Add(bccEncryptedGroup[j]);
   3.206 +                    newMessage.Bcc.Add(bccEncryptedGroup[j]);
   3.207  
   3.208                      encryptedMessages.Add(newMessage);
   3.209                  }
   3.210  
   3.211 -                // Fourth, create single mail item for unencrypted BCC
   3.212 +                // Fourth, create single mail item for unencrypted Bcc
   3.213                  if (bccUnencryptedGroup.Count > 0)
   3.214                  {
   3.215                      // Look for existing unencrypted email to use (there should always be only one of these)
   3.216 @@ -834,15 +834,15 @@
   3.217                      else
   3.218                      {
   3.219                          newMessage = bccMessages[i].Copy();
   3.220 -                        newMessage.BCC.Clear();
   3.221 -                        newMessage.CC.Clear();
   3.222 +                        newMessage.Bcc.Clear();
   3.223 +                        newMessage.Cc.Clear();
   3.224                          newMessage.To.Clear();
   3.225                          unencryptedMessages.Add(newMessage);
   3.226                      }
   3.227  
   3.228                      for (int j = 0; j < bccUnencryptedGroup.Count; j++)
   3.229                      {
   3.230 -                        newMessage.BCC.Add(bccUnencryptedGroup[j]);
   3.231 +                        newMessage.Bcc.Add(bccUnencryptedGroup[j]);
   3.232                      }
   3.233                  }
   3.234              }
     4.1 --- a/PEPIdentity.cs	Wed Oct 05 23:58:06 2016 +0200
     4.2 +++ b/PEPIdentity.cs	Thu Oct 06 19:44:58 2016 +0200
     4.3 @@ -78,7 +78,7 @@
     4.4          /// <summary>
     4.5          /// Gets or sets the email address of the identity.
     4.6          /// Note: For get, the address used is the smart address.
     4.7 -        /// If smart address is enabled, and the set address is empty/null, the username is 
     4.8 +        /// If smart address is enabled, and the set address is empty/null, the user name is 
     4.9          /// considered the address if it's formatted as an address itself.
    4.10          /// </summary>
    4.11          public string Address
    4.12 @@ -139,13 +139,13 @@
    4.13          /// <summary>
    4.14          /// Gets or sets a unique user ID for the identity.
    4.15          /// </summary>
    4.16 -        public string UserID
    4.17 +        public string UserId
    4.18          {
    4.19              get { return (this.internalIdentity.UserId); }
    4.20              set
    4.21              {
    4.22                  this.internalIdentity.UserId = value;
    4.23 -                this.RaisePropertyChangedEvent(nameof(this.UserID));
    4.24 +                this.RaisePropertyChangedEvent(nameof(this.UserId));
    4.25              }
    4.26          }
    4.27  
    4.28 @@ -153,13 +153,13 @@
    4.29          /// Gets or sets the user name of the identity.
    4.30          /// This is what the identity should be displayed as.
    4.31          /// </summary>
    4.32 -        public string Username
    4.33 +        public string UserName
    4.34          {
    4.35              get { return (this.internalIdentity.UserName); }
    4.36              set
    4.37              {
    4.38                  this.internalIdentity.UserName = value;
    4.39 -                this.RaisePropertyChangedEvent(nameof(this.Username));
    4.40 +                this.RaisePropertyChangedEvent(nameof(this.UserName));
    4.41                  this.RaisePropertyChangedEvent(nameof(this.DisplayString));
    4.42                  this.RaisePropertyChangedEvent(nameof(this.IsAddressValid));
    4.43              }
    4.44 @@ -182,7 +182,7 @@
    4.45  
    4.46          /// <summary>
    4.47          /// Gets or sets whether smart address processing is enabled.
    4.48 -        /// If smart address is enabled, and the set address is empty/null, the username is 
    4.49 +        /// If smart address is enabled, and the set address is empty/null, the user name is 
    4.50          /// considered the address if it's formatted as an address itself.
    4.51          /// </summary>
    4.52          public bool IsSmartAddressEnabled
    4.53 @@ -211,7 +211,7 @@
    4.54          ///////////////////////////////////////////////////////////
    4.55  
    4.56          /// <summary>
    4.57 -        /// Gets the string to display for this identity (based on Username and Address).
    4.58 +        /// Gets the string to display for this identity (based on UserName and Address).
    4.59          /// This internally will call .ToString().
    4.60          /// </summary>
    4.61          public string DisplayString
    4.62 @@ -223,7 +223,7 @@
    4.63          /// Gets whether the identity address is valid for the pEp engine and further use.
    4.64          /// This can only validate the basic format of the address (xxxx@xxxx.xxx).
    4.65          /// Note: The address used is the smart address.
    4.66 -        /// If smart address is enabled, and the set address is empty/null, the username is 
    4.67 +        /// If smart address is enabled, and the set address is empty/null, the user name is 
    4.68          /// considered the address if it's formatted as an address itself.
    4.69          /// </summary>
    4.70          public bool IsAddressValid
    4.71 @@ -245,7 +245,7 @@
    4.72              {
    4.73                  bool isEmpty = true;
    4.74  
    4.75 -                // Check address
    4.76 +                // Check Address
    4.77                  if (isEmpty)
    4.78                  {
    4.79                      // Do not use the smart address
    4.80 @@ -268,7 +268,7 @@
    4.81  
    4.82                  // Skip Language
    4.83  
    4.84 -                // Check UserID
    4.85 +                // Check UserId
    4.86                  if (isEmpty)
    4.87                  {
    4.88                      if (string.IsNullOrEmpty(this.internalIdentity.UserId) == false)
    4.89 @@ -277,7 +277,7 @@
    4.90                      }
    4.91                  }
    4.92  
    4.93 -                // Check Username
    4.94 +                // Check UserName
    4.95                  if (isEmpty)
    4.96                  {
    4.97                      if (string.IsNullOrEmpty(this.internalIdentity.UserName) == false)
    4.98 @@ -420,8 +420,8 @@
    4.99                  Comparisons.Equals(this.CommunicationType, obj.CommunicationType) &&
   4.100                  Comparisons.Equals(this.Fingerprint, obj.Fingerprint) &&
   4.101                  Comparisons.Equals(this.Language, obj.Language) &&
   4.102 -                Comparisons.Equals(this.UserID, obj.UserID) &&
   4.103 -                Comparisons.Equals(this.Username, obj.Username) &&
   4.104 +                Comparisons.Equals(this.UserId, obj.UserId) &&
   4.105 +                Comparisons.Equals(this.UserName, obj.UserName) &&
   4.106                  Comparisons.Equals(this.IsForceUnencrypted, obj.IsForceUnencrypted) &&
   4.107                  Comparisons.Equals(this.IsSmartAddressEnabled, obj.IsSmartAddressEnabled) &&
   4.108                  Comparisons.Equals(this.Members, obj.Members))
   4.109 @@ -444,8 +444,8 @@
   4.110              copy.CommunicationType = this.internalIdentity.CommType;
   4.111              copy.Fingerprint = (this.internalIdentity.fpr == null ? null : string.Copy(this.internalIdentity.fpr));
   4.112              copy.Language = (this.internalIdentity.lang == null ? null : string.Copy(this.internalIdentity.lang));
   4.113 -            copy.UserID = (this.internalIdentity.UserId == null ? null : string.Copy(this.internalIdentity.UserId));
   4.114 -            copy.Username = (this.internalIdentity.UserName == null ? null : string.Copy(this.internalIdentity.UserName));
   4.115 +            copy.UserId = (this.internalIdentity.UserId == null ? null : string.Copy(this.internalIdentity.UserId));
   4.116 +            copy.UserName = (this.internalIdentity.UserName == null ? null : string.Copy(this.internalIdentity.UserName));
   4.117  
   4.118              // IsForceUnencrypted
   4.119              if (this._IsForceUnencrypted != null)
   4.120 @@ -560,7 +560,7 @@
   4.121  
   4.122          /// <summary>
   4.123          /// Gets the calculated smart address for this identity.
   4.124 -        /// If smart address is enabled, and the set address is empty/null, the username may be returned as the address
   4.125 +        /// If smart address is enabled, and the set address is empty/null, the user name may be returned as the address
   4.126          /// if it's formatted as an address.
   4.127          /// </summary>
   4.128          /// <returns>The calculated 'smart' adress for this identity.</returns>
   4.129 @@ -569,7 +569,7 @@
   4.130              string addr = this.internalIdentity.Address;
   4.131  
   4.132              // If smart address processing is enabled, and the internal address is null/empty,
   4.133 -            // check if the username is valid and return it as the address.
   4.134 +            // check if the user name is valid and return it as the address.
   4.135              if ((this._IsSmartAddressEnabled) &&
   4.136                  (string.IsNullOrWhiteSpace(this.internalIdentity.Address)))
   4.137              {
   4.138 @@ -626,7 +626,7 @@
   4.139  
   4.140          /// <summary>
   4.141          /// Returns a string that represents this identity specifically for display.
   4.142 -        /// This will use the username if it exists, otherwise address.
   4.143 +        /// This will use the user name if it exists, otherwise address.
   4.144          /// </summary>
   4.145          /// <returns>The display string representing the identity which can be empty.</returns>
   4.146          public string ToDisplayString()
   4.147 @@ -637,7 +637,7 @@
   4.148              {
   4.149                  result = this.internalIdentity.UserName.Trim();
   4.150              }
   4.151 -            // Do not use the smart address (no need since username is tried first)
   4.152 +            // Do not use the smart address (no need since user name is tried first)
   4.153              else if (string.IsNullOrWhiteSpace(this.internalIdentity.Address) == false)
   4.154              {
   4.155                  result = this.internalIdentity.Address.Trim();
   4.156 @@ -656,7 +656,7 @@
   4.157          /// Parses the given string as a new PEPIdentity. This will never return null.
   4.158          /// The string should be of the format 'user name &lt;email@address.com&gt;'
   4.159          /// If the string does not have both &lt; and &gt; it will be read as an address if it is a valid address, 
   4.160 -        /// otherwise a username.
   4.161 +        /// otherwise a user name.
   4.162          /// </summary>
   4.163          /// <param name="str">The string to parse as a PEPIdentity.</param>
   4.164          /// <returns>The string parsed as a PEPIdentity, otherwise null if failure.</returns>
   4.165 @@ -689,7 +689,7 @@
   4.166                      {
   4.167                          // Only user name
   4.168                          result = new PEPIdentity();
   4.169 -                        result.Username = workingStr;
   4.170 +                        result.UserName = workingStr;
   4.171                      }
   4.172                  }
   4.173                  else if ((addressStartSymbol >= 0) &&
   4.174 @@ -710,7 +710,7 @@
   4.175                              (PEPIdentity.GetIsAddressValid(address)))
   4.176                          {
   4.177                              result = new PEPIdentity();
   4.178 -                            result.Username = userName;
   4.179 +                            result.UserName = userName;
   4.180                              result.Address = address;
   4.181                          }
   4.182                      }
   4.183 @@ -811,16 +811,16 @@
   4.184                      // Use Exchange information
   4.185                      if (currExchUser != null)
   4.186                      {
   4.187 -                        ownBaseIdentity.Username = currExchUser.Name;
   4.188 +                        ownBaseIdentity.UserName = currExchUser.Name;
   4.189                      }
   4.190                      // Use current user recipient information
   4.191                      else if (currUser != null)
   4.192                      {
   4.193 -                        ownBaseIdentity.Username = currUser.Name;
   4.194 +                        ownBaseIdentity.UserName = currUser.Name;
   4.195                      }
   4.196  
   4.197                      // Add user ID
   4.198 -                    ownBaseIdentity.UserID = Globals.ThisAddIn.GetUserID(ownBaseIdentity.Address, null);
   4.199 +                    ownBaseIdentity.UserId = Globals.ThisAddIn.GetUserId(ownBaseIdentity.Address, null);
   4.200                  }
   4.201  
   4.202                  // Update the identity in the pEp engine (and get fingerprint)
   4.203 @@ -998,7 +998,7 @@
   4.204          {
   4.205              string entryID;
   4.206              string address = null;
   4.207 -            string username = null;
   4.208 +            string userName = null;
   4.209              pEpIdentity ident;
   4.210              PEPIdentity own = null;
   4.211              PEPIdentity from = null;
   4.212 @@ -1054,14 +1054,14 @@
   4.213                          (sts != Globals.ReturnStatus.Success))
   4.214                      {
   4.215                          address = (string)omi.GetUserProperty(MAPIProperty.PidTagReceivedByEmailAddress.DASLName);
   4.216 -                        username = (string)omi.GetUserProperty(MAPIProperty.PidTagReceivedByName.DASLName);
   4.217 +                        userName = (string)omi.GetUserProperty(MAPIProperty.PidTagReceivedByName.DASLName);
   4.218  
   4.219                          if (string.IsNullOrEmpty(address) == false)
   4.220                          {
   4.221                              own = new PEPIdentity();
   4.222                              own.Address = address;
   4.223 -                            own.Username = username;
   4.224 -                            own.UserID = Globals.ThisAddIn.GetUserID(own.Address, null); // Not using 'myself ID'
   4.225 +                            own.UserName = userName;
   4.226 +                            own.UserId = Globals.ThisAddIn.GetUserId(own.Address, null); // Not using 'myself ID'
   4.227  
   4.228                              // Update the identity in the pEp engine (and get fingerprint)
   4.229                              try
   4.230 @@ -1149,12 +1149,12 @@
   4.231          /// Warning: The result can be null.
   4.232          /// </summary>
   4.233          /// <param name="omi">The outlook mail item to get the from/sender name from.</param>
   4.234 -        /// <param name="fromUsername">The output from/sender username (may be null).</param>
   4.235 +        /// <param name="fromUserName">The output from/sender user name (may be null).</param>
   4.236          /// <returns>The status of the method.</returns>
   4.237 -        public static Globals.ReturnStatus GetFromUsername(Outlook.MailItem omi,
   4.238 -                                                           out string fromUsername)
   4.239 +        public static Globals.ReturnStatus GetFromUserName(Outlook.MailItem omi,
   4.240 +                                                           out string fromUserName)
   4.241          {
   4.242 -            string username = null;
   4.243 +            string userName = null;
   4.244              Outlook.AddressEntry sender = null;
   4.245              Outlook.ExchangeUser exchSender = null;
   4.246              Globals.ReturnStatus status = Globals.ReturnStatus.Failure;
   4.247 @@ -1183,7 +1183,7 @@
   4.248                              exchSender = sender.GetExchangeUser();
   4.249                              if (exchSender != null)
   4.250                              {
   4.251 -                                username = exchSender.Name;
   4.252 +                                userName = exchSender.Name;
   4.253                                  status = Globals.ReturnStatus.Success;
   4.254                              }
   4.255                              else
   4.256 @@ -1194,7 +1194,7 @@
   4.257                          }
   4.258                          else
   4.259                          {
   4.260 -                            username = sender.Name;
   4.261 +                            userName = sender.Name;
   4.262                              status = Globals.ReturnStatus.Success;
   4.263                          }
   4.264                      }
   4.265 @@ -1211,7 +1211,7 @@
   4.266                      (omi.SenderEmailType != "EX") &&
   4.267                      (omi.SenderEmailAddress != null))
   4.268                  {
   4.269 -                    username = omi.SenderName;
   4.270 +                    userName = omi.SenderName;
   4.271                      status = Globals.ReturnStatus.Success;
   4.272                  }
   4.273              }
   4.274 @@ -1236,7 +1236,7 @@
   4.275                  }
   4.276              }
   4.277  
   4.278 -            fromUsername = username;
   4.279 +            fromUserName = userName;
   4.280              return (status);
   4.281          }
   4.282  
   4.283 @@ -1281,13 +1281,13 @@
   4.284                              if (sender.AddressEntryUserType == Outlook.OlAddressEntryUserType.olExchangeUserAddressEntry ||
   4.285                                  sender.AddressEntryUserType == Outlook.OlAddressEntryUserType.olExchangeRemoteUserAddressEntry)
   4.286                              {
   4.287 -                                // Use the ExchangeUser object PrimarySMTPAddress
   4.288 +                                // Use the ExchangeUser object PrimarySmtpAddress
   4.289                                  exchSender = sender.GetExchangeUser();
   4.290                                  if (exchSender != null)
   4.291                                  {
   4.292                                      from = new PEPIdentity();
   4.293                                      from.Address = exchSender.PrimarySmtpAddress;
   4.294 -                                    from.Username = exchSender.Name;
   4.295 +                                    from.UserName = exchSender.Name;
   4.296  
   4.297                                      // Add the contact force unencrypted property
   4.298                                      try
   4.299 @@ -1303,8 +1303,8 @@
   4.300                                      }
   4.301                                      catch { }
   4.302  
   4.303 -                                    // Add the UserID
   4.304 -                                    from.UserID = Globals.ThisAddIn.GetUserID(from.Address, contact);
   4.305 +                                    // Add the user ID
   4.306 +                                    from.UserId = Globals.ThisAddIn.GetUserId(from.Address, contact);
   4.307  
   4.308                                      status = Globals.ReturnStatus.Success;
   4.309                                  }
   4.310 @@ -1318,7 +1318,7 @@
   4.311                              {
   4.312                                  from = new PEPIdentity();
   4.313                                  from.Address = (string)MAPIHelper.GetProperty(sender, MAPIProperty.PidTagSmtpAddress);
   4.314 -                                from.Username = sender.Name;
   4.315 +                                from.UserName = sender.Name;
   4.316  
   4.317                                  // Add the contact force unencrypted property
   4.318                                  try
   4.319 @@ -1334,8 +1334,8 @@
   4.320                                  }
   4.321                                  catch { }
   4.322  
   4.323 -                                // Add the UserID
   4.324 -                                from.UserID = Globals.ThisAddIn.GetUserID(from.Address, contact);
   4.325 +                                // Add the user ID
   4.326 +                                from.UserId = Globals.ThisAddIn.GetUserId(from.Address, contact);
   4.327  
   4.328                                  status = Globals.ReturnStatus.Success;
   4.329                              }
   4.330 @@ -1355,7 +1355,7 @@
   4.331                      {
   4.332                          from = new PEPIdentity();
   4.333                          from.Address = omi.SenderEmailAddress;
   4.334 -                        from.Username = omi.SenderName;
   4.335 +                        from.UserName = omi.SenderName;
   4.336  
   4.337                          // Add the contact force unencrypted property
   4.338                          try
   4.339 @@ -1371,8 +1371,8 @@
   4.340                          }
   4.341                          catch { }
   4.342  
   4.343 -                        // Add the UserID
   4.344 -                        from.UserID = Globals.ThisAddIn.GetUserID(from.Address, contact);
   4.345 +                        // Add the user ID
   4.346 +                        from.UserId = Globals.ThisAddIn.GetUserId(from.Address, contact);
   4.347  
   4.348                          status = Globals.ReturnStatus.Success;
   4.349                      }
   4.350 @@ -1547,7 +1547,7 @@
   4.351                  {
   4.352                      if (addressEntry != null)
   4.353                      {
   4.354 -                        // Save contact for later UserID calculation
   4.355 +                        // Save contact for later user ID calculation
   4.356                          contact = addressEntry.GetContact();
   4.357                          if (contact != null)
   4.358                          {
   4.359 @@ -1593,7 +1593,7 @@
   4.360                                  {
   4.361                                      newIdent = new PEPIdentity();
   4.362                                      newIdent.Address = null;
   4.363 -                                    newIdent.Username = recipient.Name;
   4.364 +                                    newIdent.UserName = recipient.Name;
   4.365                                      newIdent.IsForceUnencrypted = forceUnencryptedProperty;
   4.366  
   4.367                                      // Note: index starts at 1
   4.368 @@ -1702,8 +1702,8 @@
   4.369                      // Add group
   4.370                      newIdent = new PEPIdentity();
   4.371                      newIdent.Address = null;
   4.372 -                    newIdent.Username = exchDL.Name;
   4.373 -                    newIdent.UserID = null;
   4.374 +                    newIdent.UserName = exchDL.Name;
   4.375 +                    newIdent.UserId = null;
   4.376  
   4.377                      // Add members
   4.378                      if (exchDLMembers != null)
   4.379 @@ -1719,7 +1719,7 @@
   4.380                                  {
   4.381                                      newIdent2 = new PEPIdentity();
   4.382                                      newIdent2.Address = exchUser.PrimarySmtpAddress;
   4.383 -                                    newIdent2.Username = exchUser.Name;
   4.384 +                                    newIdent2.UserName = exchUser.Name;
   4.385  
   4.386                                      // Add the contact force unencrypted property
   4.387                                      currContact = null;
   4.388 @@ -1737,7 +1737,7 @@
   4.389                                          currContact = null;
   4.390                                      }
   4.391  
   4.392 -                                    newIdent2.UserID = Globals.ThisAddIn.GetUserID(newIdent2.Address, currContact);
   4.393 +                                    newIdent2.UserId = Globals.ThisAddIn.GetUserId(newIdent2.Address, currContact);
   4.394                                      newIdent.Members.Add(newIdent2);
   4.395                                  }
   4.396                              }
   4.397 @@ -1873,16 +1873,16 @@
   4.398                      newIdent.Address = tempAddress.Trim();
   4.399                  }
   4.400  
   4.401 -                // Add username if possible
   4.402 +                // Add user name if possible
   4.403                  if (string.IsNullOrWhiteSpace(tempUserName) == false)
   4.404                  {
   4.405 -                    newIdent.Username = tempUserName.Trim();
   4.406 +                    newIdent.UserName = tempUserName.Trim();
   4.407                  }
   4.408  
   4.409                  // Get the unique user ID if possible
   4.410                  if (string.IsNullOrEmpty(newIdent.Address) == false)
   4.411                  {
   4.412 -                    newIdent.UserID = Globals.ThisAddIn.GetUserID(newIdent.Address, contact);
   4.413 +                    newIdent.UserId = Globals.ThisAddIn.GetUserId(newIdent.Address, contact);
   4.414                  }
   4.415  
   4.416                  identityCreated = true;
     5.1 --- a/PEPMessage.cs	Wed Oct 05 23:58:06 2016 +0200
     5.2 +++ b/PEPMessage.cs	Thu Oct 06 19:44:58 2016 +0200
     5.3 @@ -34,15 +34,15 @@
     5.4          public static readonly MAPIProperty.MAPIProp XPidNamePEPProtocolVersion = new MAPIProperty.MAPIProp(PR_X_PEP_PROTOCOL_VERSION_NAME, MAPIProperty.PS_INTERNET_HEADERS);
     5.5  
     5.6          private List<PEPAttachment> _Attachments;
     5.7 -        private List<PEPIdentity>   _BCC;
     5.8 -        private List<PEPIdentity>   _CC;
     5.9 -        private string              _ConversationID;
    5.10 +        private List<PEPIdentity>   _Bcc;
    5.11 +        private List<PEPIdentity>   _Cc;
    5.12 +        private string              _ConversationId;
    5.13          private string              _ConversationIndex;
    5.14          private string              _ConversationTopic;
    5.15          private pEpMsgDirection     _Direction;
    5.16          private bool                _ForceUnencrypted;
    5.17          private PEPIdentity         _From;
    5.18 -        private string              _ID;
    5.19 +        private string              _Id;
    5.20          private string              _KeyList;
    5.21          private List<string>        _Keywords;
    5.22          private string              _LongMsg;
    5.23 @@ -82,7 +82,7 @@
    5.24          /// Gets the list of attachements for this message.
    5.25          ///          MailItem : Corresponds to property 'Attachments' which contains 'Attachment'
    5.26          /// CryptableMailItem : not exposed
    5.27 -        ///       TextMessage : Corresponds to property 'attachments' which contains 'Blob'
    5.28 +        ///       TextMessage : Corresponds to property 'Attachments' which contains 'Blob'
    5.29          /// </summary>
    5.30          public List<PEPAttachment> Attachments
    5.31          {
    5.32 @@ -93,22 +93,22 @@
    5.33          /// Gets the list of identities to be blind carbon copied on the message.
    5.34          ///          MailItem : Component of property 'Recipients' which contains 'Recipient'
    5.35          /// CryptableMailItem : not exposed directly (part of Recipients)
    5.36 -        ///       TextMessage : Corresponds to property 'bcc'
    5.37 +        ///       TextMessage : Corresponds to property 'Bcc'
    5.38          /// </summary>
    5.39 -        public List<PEPIdentity> BCC
    5.40 +        public List<PEPIdentity> Bcc
    5.41          {
    5.42 -            get { return (this._BCC); }
    5.43 +            get { return (this._Bcc); }
    5.44          }
    5.45  
    5.46          /// <summary>
    5.47          /// Gets the list of identities to be carbon copied on the message.
    5.48          ///          MailItem : Component of property 'Recipients' which contains 'Recipient'
    5.49          /// CryptableMailItem : not exposed directly (part of Recipients)
    5.50 -        ///       TextMessage : Corresponds to property 'cc'
    5.51 +        ///       TextMessage : Corresponds to property 'Cc'
    5.52          /// </summary>
    5.53 -        public List<PEPIdentity> CC
    5.54 +        public List<PEPIdentity> Cc
    5.55          {
    5.56 -            get { return (this._CC); }
    5.57 +            get { return (this._Cc); }
    5.58          }
    5.59  
    5.60          /// <summary>
    5.61 @@ -118,13 +118,13 @@
    5.62          /// CryptableMailItem : Corresponds to property 'ConversationID'
    5.63          ///       TextMessage : not supported
    5.64          /// </summary>
    5.65 -        public string ConversationID
    5.66 +        public string ConversationId
    5.67          {
    5.68 -            get { return (this._ConversationID); }
    5.69 +            get { return (this._ConversationId); }
    5.70              set
    5.71              {
    5.72 -                this._ConversationID = value;
    5.73 -                this.RaisePropertyChangedEvent(nameof(this.ConversationID));
    5.74 +                this._ConversationId = value;
    5.75 +                this.RaisePropertyChangedEvent(nameof(this.ConversationId));
    5.76              }
    5.77          }
    5.78  
    5.79 @@ -185,7 +185,7 @@
    5.80          /// Gets or sets the direction (incoming or outgoing) of the message.
    5.81          ///          MailItem : not supported (calculated from various properties)
    5.82          /// CryptableMailItem : Corresponds 1-to-1 with property 'IsIncoming'
    5.83 -        ///       TextMessage : Corresponds to property 'dir'
    5.84 +        ///       TextMessage : Corresponds to property 'Dir'
    5.85          /// </summary>
    5.86          public pEpMsgDirection Direction
    5.87          {
    5.88 @@ -218,7 +218,7 @@
    5.89          /// Warning: this value can be null.
    5.90          ///          MailItem : not supported (calculated from various properties)
    5.91          /// CryptableMailItem : Corresponds to property 'From'
    5.92 -        ///       TextMessage : Corresponds to property 'from'
    5.93 +        ///       TextMessage : Corresponds to property 'From'
    5.94          /// </summary>
    5.95          public PEPIdentity From
    5.96          {
    5.97 @@ -235,15 +235,15 @@
    5.98          /// Warning: this value can be null.
    5.99          ///          MailItem : Corresponds to MAPI property PidTagInternetMessageId
   5.100          /// CryptableMailItem : not supported
   5.101 -        ///       TextMessage : Corresponds to property 'id'
   5.102 +        ///       TextMessage : Corresponds to property 'Id'
   5.103          /// </summary>
   5.104 -        public string ID
   5.105 +        public string Id
   5.106          {
   5.107 -            get { return (this._ID); }
   5.108 +            get { return (this._Id); }
   5.109              set
   5.110              {
   5.111 -                this._ID = value;
   5.112 -                this.RaisePropertyChangedEvent(nameof(this.ID));
   5.113 +                this._Id = value;
   5.114 +                this.RaisePropertyChangedEvent(nameof(this.Id));
   5.115              }
   5.116          }
   5.117  
   5.118 @@ -289,7 +289,7 @@
   5.119          /// Gets the list of keywords associated with the message.
   5.120          ///          MailItem : Corresponds to property 'Categories'
   5.121          /// CryptableMailItem : not supported
   5.122 -        ///       TextMessage : Corresponds to property 'keywords'
   5.123 +        ///       TextMessage : Corresponds to property 'Keywords'
   5.124          /// </summary>
   5.125          public List<string> Keywords
   5.126          {
   5.127 @@ -301,7 +301,7 @@
   5.128          /// Warning: this value can be null.
   5.129          ///          MailItem : Corresponds to property 'Body' (also BodyFormat)
   5.130          /// CryptableMailItem : not exposed (processed internally)
   5.131 -        ///       TextMessage : Corresponds to property 'longmsg'
   5.132 +        ///       TextMessage : Corresponds to property 'LongMsg'
   5.133          /// </summary>
   5.134          public string LongMsg
   5.135          {
   5.136 @@ -318,7 +318,7 @@
   5.137          /// Warning: this value can be null.
   5.138          ///          MailItem : Corresponds to property 'HTMLBody' (also BodyFormat)
   5.139          /// CryptableMailItem : not exposed (processed internally)
   5.140 -        ///       TextMessage : Corresponds to property 'longmsg_formatted'
   5.141 +        ///       TextMessage : Corresponds to property 'LongMsgFormatted'
   5.142          /// </summary>
   5.143          public string LongMsgFormattedHTML
   5.144          {
   5.145 @@ -442,7 +442,7 @@
   5.146          /// Warning: this value can be null.
   5.147          ///          MailItem : Corresponds to property 'Subject'
   5.148          /// CryptableMailItem : not supported
   5.149 -        ///       TextMessage : Corresponds to property 'shortmsg'
   5.150 +        ///       TextMessage : Corresponds to property 'Shortmsg'
   5.151          /// </summary>
   5.152          public string ShortMsg
   5.153          {
   5.154 @@ -458,7 +458,7 @@
   5.155          /// Gets the list of identities to receive the message.
   5.156          ///          MailItem : Component of property 'Recipients' which contains 'Recipient'
   5.157          /// CryptableMailItem : not exposed directly (part of Recipients)
   5.158 -        ///       TextMessage : Corresponds to property 'to'
   5.159 +        ///       TextMessage : Corresponds to property 'To'
   5.160          /// </summary>
   5.161          public List<PEPIdentity> To
   5.162          {
   5.163 @@ -466,15 +466,15 @@
   5.164          }
   5.165  
   5.166          /// <summary>
   5.167 -        /// Gets the total number of all recipients in the message (BCC, CC &amp; To).
   5.168 +        /// Gets the total number of all recipients in the message (Bcc, Cc &amp; To).
   5.169          /// </summary>
   5.170          public int RecipientCount
   5.171          {
   5.172 -            get { return (this._BCC.Count + this._CC.Count + this._To.Count); }
   5.173 +            get { return (this._Bcc.Count + this._Cc.Count + this._To.Count); }
   5.174          }
   5.175  
   5.176          /// <summary>
   5.177 -        /// Gets a list of all recipients in the message (BCC, CC &amp; To).
   5.178 +        /// Gets a list of all recipients in the message (Bcc, Cc &amp; To).
   5.179          /// Each recipient in the returned list is a copy.
   5.180          /// </summary>
   5.181          public PEPIdentity[] Recipients
   5.182 @@ -483,16 +483,16 @@
   5.183              {
   5.184                  List<PEPIdentity> recipients = new List<PEPIdentity>();
   5.185  
   5.186 -                // BCC
   5.187 -                for (int i = 0; i < this._BCC.Count; i++)
   5.188 +                // Bcc
   5.189 +                for (int i = 0; i < this._Bcc.Count; i++)
   5.190                  {
   5.191 -                    recipients.Add(this._BCC[i].Copy());
   5.192 +                    recipients.Add(this._Bcc[i].Copy());
   5.193                  }
   5.194  
   5.195 -                // CC
   5.196 -                for (int i = 0; i < this._CC.Count; i++)
   5.197 +                // Cc
   5.198 +                for (int i = 0; i < this._Cc.Count; i++)
   5.199                  {
   5.200 -                    recipients.Add(this._CC[i].Copy());
   5.201 +                    recipients.Add(this._Cc[i].Copy());
   5.202                  }
   5.203  
   5.204                  // To
   5.205 @@ -551,16 +551,16 @@
   5.206                  attachments.Add(this._Attachments[i].ToCOMType());
   5.207              }
   5.208  
   5.209 -            // Convert BCC
   5.210 -            for (int i = 0; i < this._BCC.Count; i++)
   5.211 +            // Convert Bcc
   5.212 +            for (int i = 0; i < this._Bcc.Count; i++)
   5.213              {
   5.214 -                bcc.Add(this._BCC[i].ToCOMType());
   5.215 +                bcc.Add(this._Bcc[i].ToCOMType());
   5.216              }
   5.217  
   5.218 -            // Convert CC
   5.219 -            for (int i = 0; i < this._CC.Count; i++)
   5.220 +            // Convert Cc
   5.221 +            for (int i = 0; i < this._Cc.Count; i++)
   5.222              {
   5.223 -                cc.Add(this._CC[i].ToCOMType());
   5.224 +                cc.Add(this._Cc[i].ToCOMType());
   5.225              }
   5.226  
   5.227              // Convert To
   5.228 @@ -642,7 +642,7 @@
   5.229              result.Cc = cc.ToArray();
   5.230              result.Dir = this._Direction;
   5.231              result.From = (this._From != null ? this._From.ToCOMType() : result.From);
   5.232 -            result.Id = this._ID;
   5.233 +            result.Id = this._Id;
   5.234              result.Keywords = this._Keywords.ToArray();
   5.235              result.Longmsg = this._LongMsg;
   5.236              result.LongmsgFormatted = this._LongMsgFormattedHTML;
   5.237 @@ -693,15 +693,15 @@
   5.238              }
   5.239  
   5.240              if (Comparisons.Equals(this.Attachments, obj.Attachments) &&
   5.241 -                Comparisons.Equals(this.BCC, obj.BCC) &&
   5.242 -                Comparisons.Equals(this.CC, obj.CC) &&
   5.243 -                Comparisons.Equals(this.ConversationID, obj.ConversationID) &&
   5.244 +                Comparisons.Equals(this.Bcc, obj.Bcc) &&
   5.245 +                Comparisons.Equals(this.Cc, obj.Cc) &&
   5.246 +                Comparisons.Equals(this.ConversationId, obj.ConversationId) &&
   5.247                  Comparisons.Equals(this.ConversationIndex, obj.ConversationIndex) &&
   5.248                  Comparisons.Equals(this.ConversationTopic, obj.ConversationTopic) &&
   5.249                  Comparisons.Equals(this.Direction, obj.Direction) &&
   5.250                  Comparisons.Equals(this.ForceUnencrypted, obj.ForceUnencrypted) &&
   5.251                  Comparisons.Equals(this.From, obj.From) &&
   5.252 -                Comparisons.Equals(this.ID, obj.ID) &&
   5.253 +                Comparisons.Equals(this.Id, obj.Id) &&
   5.254                  Comparisons.Equals(this.KeyList, obj.KeyList) &&
   5.255                  Comparisons.Equals(this.Keywords, obj.Keywords) &&
   5.256                  Comparisons.Equals(this.LongMsg, obj.LongMsg) &&
   5.257 @@ -777,27 +777,27 @@
   5.258                  }
   5.259              }
   5.260  
   5.261 -            // BCC
   5.262 -            copy.BCC.Clear();
   5.263 -            for (int i = 0; i < this._BCC.Count; i++)
   5.264 +            // Bcc
   5.265 +            copy.Bcc.Clear();
   5.266 +            for (int i = 0; i < this._Bcc.Count; i++)
   5.267              {
   5.268 -                copy.BCC.Add(this._BCC[i].Copy());
   5.269 +                copy.Bcc.Add(this._Bcc[i].Copy());
   5.270              }
   5.271  
   5.272 -            // CC
   5.273 -            copy.CC.Clear();
   5.274 -            for (int i = 0; i < this._CC.Count; i++)
   5.275 +            // Cc
   5.276 +            copy.Cc.Clear();
   5.277 +            for (int i = 0; i < this._Cc.Count; i++)
   5.278              {
   5.279 -                copy.CC.Add(this._CC[i].Copy());
   5.280 +                copy.Cc.Add(this._Cc[i].Copy());
   5.281              }
   5.282  
   5.283 -            copy.ConversationID = (this._ConversationID == null ? null : string.Copy(this._ConversationID));
   5.284 +            copy.ConversationId = (this._ConversationId == null ? null : string.Copy(this._ConversationId));
   5.285              copy.ConversationIndex = (this._ConversationIndex == null ? null : string.Copy(this._ConversationIndex));
   5.286              copy.ConversationTopic = (this._ConversationTopic == null ? null : string.Copy(this._ConversationTopic));
   5.287              copy.Direction = this._Direction;
   5.288              copy.ForceUnencrypted = this._ForceUnencrypted;
   5.289              copy.From = (this._From == null ? null : this._From.Copy());
   5.290 -            copy.ID = (this._ID == null ? null : string.Copy(this._ID));
   5.291 +            copy.Id = (this._Id == null ? null : string.Copy(this._Id));
   5.292              copy.KeyList = (this._KeyList == null ? null : string.Copy(this._KeyList));
   5.293  
   5.294              // Keywords
   5.295 @@ -863,15 +863,15 @@
   5.296          public void Reset()
   5.297          {
   5.298              this._Attachments = new List<PEPAttachment>();
   5.299 -            this._BCC = new List<PEPIdentity>();
   5.300 -            this._CC = new List<PEPIdentity>();
   5.301 -            this._ConversationID = null;
   5.302 +            this._Bcc = new List<PEPIdentity>();
   5.303 +            this._Cc = new List<PEPIdentity>();
   5.304 +            this._ConversationId = null;
   5.305              this._ConversationIndex = null;
   5.306              this._ConversationTopic = null;
   5.307              this._Direction = pEpMsgDirection.pEpDirIncoming;
   5.308              this._ForceUnencrypted = false;
   5.309              this._From = null;
   5.310 -            this._ID = null;
   5.311 +            this._Id = null;
   5.312              this._KeyList = null;
   5.313              this._Keywords = new List<string>();
   5.314              this._LongMsg = null;
   5.315 @@ -886,15 +886,15 @@
   5.316              this._To = new List<PEPIdentity>();
   5.317  
   5.318              this.RaisePropertyChangedEvent(nameof(this.Attachments));
   5.319 -            this.RaisePropertyChangedEvent(nameof(this.BCC));
   5.320 -            this.RaisePropertyChangedEvent(nameof(this.CC));
   5.321 -            this.RaisePropertyChangedEvent(nameof(this.ConversationID));
   5.322 +            this.RaisePropertyChangedEvent(nameof(this.Bcc));
   5.323 +            this.RaisePropertyChangedEvent(nameof(this.Cc));
   5.324 +            this.RaisePropertyChangedEvent(nameof(this.ConversationId));
   5.325              this.RaisePropertyChangedEvent(nameof(this.ConversationIndex));
   5.326              this.RaisePropertyChangedEvent(nameof(this.ConversationTopic));
   5.327              this.RaisePropertyChangedEvent(nameof(this.Direction));
   5.328              this.RaisePropertyChangedEvent(nameof(this.ForceUnencrypted));
   5.329              this.RaisePropertyChangedEvent(nameof(this.From));
   5.330 -            this.RaisePropertyChangedEvent(nameof(this.ID));
   5.331 +            this.RaisePropertyChangedEvent(nameof(this.Id));
   5.332              this.RaisePropertyChangedEvent(nameof(this.KeyList));
   5.333              this.RaisePropertyChangedEvent(nameof(this.Keywords));
   5.334              this.RaisePropertyChangedEvent(nameof(this.LongMsg));
   5.335 @@ -940,13 +940,13 @@
   5.336  
   5.337              if (msg != null)
   5.338              {
   5.339 -                this._ConversationID = msg.ConversationID;
   5.340 +                this._ConversationId = msg.ConversationId;
   5.341                  this._ConversationIndex = msg.ConversationIndex;
   5.342                  this._ConversationTopic = msg.ConversationTopic;
   5.343                  this._ForceUnencrypted = msg.ForceUnencrypted;
   5.344                  this._NeverUnsecure = msg.NeverUnsecure;
   5.345  
   5.346 -                this.RaisePropertyChangedEvent(nameof(this.ConversationID));
   5.347 +                this.RaisePropertyChangedEvent(nameof(this.ConversationId));
   5.348                  this.RaisePropertyChangedEvent(nameof(this.ConversationIndex));
   5.349                  this.RaisePropertyChangedEvent(nameof(this.ConversationTopic));
   5.350                  this.RaisePropertyChangedEvent(nameof(this.ForceUnencrypted));
   5.351 @@ -993,21 +993,21 @@
   5.352                  }
   5.353  
   5.354                  // Set recipients
   5.355 -                for (int i = 0; i < this._BCC.Count; i++)
   5.356 +                for (int i = 0; i < this._Bcc.Count; i++)
   5.357                  {
   5.358 -                    if (string.IsNullOrWhiteSpace(this._BCC[i].Address) == false)
   5.359 +                    if (string.IsNullOrWhiteSpace(this._Bcc[i].Address) == false)
   5.360                      {
   5.361                          // Add by address
   5.362 -                        newRecipient = recipients.Add(this._BCC[i].Address);
   5.363 +                        newRecipient = recipients.Add(this._Bcc[i].Address);
   5.364                          newRecipient.Type = (int)Outlook.OlMailRecipientType.olBCC;
   5.365  
   5.366                          Marshal.ReleaseComObject(newRecipient);
   5.367                          newRecipient = null;
   5.368                      }
   5.369 -                    else if (string.IsNullOrWhiteSpace(this._BCC[i].Username) == false)
   5.370 +                    else if (string.IsNullOrWhiteSpace(this._Bcc[i].UserName) == false)
   5.371                      {
   5.372 -                        // Add by username (required for distribution lists)
   5.373 -                        newRecipient = recipients.Add(this._BCC[i].Username);
   5.374 +                        // Add by user name (required for distribution lists)
   5.375 +                        newRecipient = recipients.Add(this._Bcc[i].UserName);
   5.376                          newRecipient.Type = (int)Outlook.OlMailRecipientType.olBCC;
   5.377  
   5.378                          Marshal.ReleaseComObject(newRecipient);
   5.379 @@ -1015,21 +1015,21 @@
   5.380                      }
   5.381                  }
   5.382  
   5.383 -                for (int i = 0; i < this._CC.Count; i++)
   5.384 +                for (int i = 0; i < this._Cc.Count; i++)
   5.385                  {
   5.386 -                    if (string.IsNullOrWhiteSpace(this._CC[i].Address) == false)
   5.387 +                    if (string.IsNullOrWhiteSpace(this._Cc[i].Address) == false)
   5.388                      {
   5.389                          // Add by address
   5.390 -                        newRecipient = recipients.Add(this._CC[i].Address);
   5.391 +                        newRecipient = recipients.Add(this._Cc[i].Address);
   5.392                          newRecipient.Type = (int)Outlook.OlMailRecipientType.olCC;
   5.393  
   5.394                          Marshal.ReleaseComObject(newRecipient);
   5.395                          newRecipient = null;
   5.396                      }
   5.397 -                    else if (string.IsNullOrWhiteSpace(this._CC[i].Username) == false)
   5.398 +                    else if (string.IsNullOrWhiteSpace(this._Cc[i].UserName) == false)
   5.399                      {
   5.400 -                        // Add by username (required for distribution lists)
   5.401 -                        newRecipient = recipients.Add(this._CC[i].Username);
   5.402 +                        // Add by user name (required for distribution lists)
   5.403 +                        newRecipient = recipients.Add(this._Cc[i].UserName);
   5.404                          newRecipient.Type = (int)Outlook.OlMailRecipientType.olCC;
   5.405  
   5.406                          Marshal.ReleaseComObject(newRecipient);
   5.407 @@ -1048,10 +1048,10 @@
   5.408                          Marshal.ReleaseComObject(newRecipient);
   5.409                          newRecipient = null;
   5.410                      }
   5.411 -                    else if (string.IsNullOrWhiteSpace(this._To[i].Username) == false)
   5.412 +                    else if (string.IsNullOrWhiteSpace(this._To[i].UserName) == false)
   5.413                      {
   5.414 -                        // Add by username (required for distribution lists)
   5.415 -                        newRecipient = recipients.Add(this._To[i].Username);
   5.416 +                        // Add by user name (required for distribution lists)
   5.417 +                        newRecipient = recipients.Add(this._To[i].UserName);
   5.418                          newRecipient.Type = (int)Outlook.OlMailRecipientType.olTo;
   5.419  
   5.420                          Marshal.ReleaseComObject(newRecipient);
   5.421 @@ -1082,10 +1082,10 @@
   5.422                              fromRecipient = recipients.Add(this._From.Address);
   5.423                              fromRecipient.Type = (int)Outlook.OlMailRecipientType.olTo;
   5.424                          }
   5.425 -                        else if (string.IsNullOrWhiteSpace(this._From.Username) == false)
   5.426 +                        else if (string.IsNullOrWhiteSpace(this._From.UserName) == false)
   5.427                          {
   5.428 -                            // Add by username (required for distribution lists)
   5.429 -                            fromRecipient = recipients.Add(this._From.Username);
   5.430 +                            // Add by user name (required for distribution lists)
   5.431 +                            fromRecipient = recipients.Add(this._From.UserName);
   5.432                              fromRecipient.Type = (int)Outlook.OlMailRecipientType.olTo;
   5.433                          }
   5.434                      }
   5.435 @@ -1200,7 +1200,7 @@
   5.436                          // Set Sender's name and email properties via MAPIProperty (won't be created automatically when assigníng Sender)
   5.437                          try
   5.438                          {
   5.439 -                            MAPIHelper.SetProperty(omi, MAPIProperty.PidTagSenderName, this._From.Username);
   5.440 +                            MAPIHelper.SetProperty(omi, MAPIProperty.PidTagSenderName, this._From.UserName);
   5.441                              MAPIHelper.SetProperty(omi, MAPIProperty.PidTagSenderEmailAddress, this._From.Address);
   5.442                          }
   5.443                          catch (Exception ex)
   5.444 @@ -1312,7 +1312,7 @@
   5.445                  // ID
   5.446                  try
   5.447                  {
   5.448 -                    MAPIHelper.SetProperty(omi, MAPIProperty.PidTagInternetMessageId, this._ID);
   5.449 +                    MAPIHelper.SetProperty(omi, MAPIProperty.PidTagInternetMessageId, this._Id);
   5.450                  }
   5.451                  catch { }
   5.452  
   5.453 @@ -1519,13 +1519,13 @@
   5.454          }
   5.455  
   5.456          /// <summary>
   5.457 -        /// Recursivley converts all "BCC", "CC", and "To" identities into a 'flat' list of any members.
   5.458 +        /// Recursivley converts all "Bcc", "Cc", and "To" identities into a 'flat' list of any members.
   5.459          /// This will remove groups (hierarchy) and convert a group into it's members.
   5.460          /// </summary>
   5.461          public void FlattenAllRecipientIdentities()
   5.462          {
   5.463 -            this._BCC = PEPIdentity.ToFlatList(this._BCC);
   5.464 -            this._CC = PEPIdentity.ToFlatList(this._CC);
   5.465 +            this._Bcc = PEPIdentity.ToFlatList(this._Bcc);
   5.466 +            this._Cc = PEPIdentity.ToFlatList(this._Cc);
   5.467              this._To = PEPIdentity.ToFlatList(this._To);
   5.468  
   5.469              return;
   5.470 @@ -1732,29 +1732,29 @@
   5.471                      }
   5.472                  }
   5.473  
   5.474 -                // BCC
   5.475 -                newMessage.BCC.Clear();
   5.476 +                // Bcc
   5.477 +                newMessage.Bcc.Clear();
   5.478                  if (msg.Bcc != null)
   5.479                  {
   5.480                      for (int i = 0; i < msg.Bcc.Length; i++)
   5.481                      {
   5.482 -                        newMessage.BCC.Add(new PEPIdentity((pEpIdentity)msg.Bcc.GetValue(i)));
   5.483 +                        newMessage.Bcc.Add(new PEPIdentity((pEpIdentity)msg.Bcc.GetValue(i)));
   5.484                      }
   5.485                  }
   5.486  
   5.487 -                // CC
   5.488 -                newMessage.CC.Clear();
   5.489 +                // Cc
   5.490 +                newMessage.Cc.Clear();
   5.491                  if (msg.Cc != null)
   5.492                  {
   5.493                      for (int i = 0; i < msg.Cc.Length; i++)
   5.494                      {
   5.495 -                        newMessage.CC.Add(new PEPIdentity((pEpIdentity)msg.Cc.GetValue(i)));
   5.496 +                        newMessage.Cc.Add(new PEPIdentity((pEpIdentity)msg.Cc.GetValue(i)));
   5.497                      }
   5.498                  }
   5.499  
   5.500                  newMessage.Direction = msg.Dir;
   5.501                  newMessage.From = new PEPIdentity(msg.From);
   5.502 -                newMessage.ID = msg.Id;
   5.503 +                newMessage.Id = msg.Id;
   5.504  
   5.505                  // Keywords
   5.506                  newMessage.Keywords.Clear();
   5.507 @@ -1896,8 +1896,8 @@
   5.508                   */
   5.509  
   5.510                  // Calculate recipients
   5.511 -                newMessage.BCC.Clear();
   5.512 -                newMessage.CC.Clear();
   5.513 +                newMessage.Bcc.Clear();
   5.514 +                newMessage.Cc.Clear();
   5.515                  newMessage.To.Clear();
   5.516                  recipients = omi.Recipients;
   5.517                  for (int i = 1; i <= recipients.Count; i++)
   5.518 @@ -1911,7 +1911,7 @@
   5.519                                  sts = PEPIdentity.Create(currRecipient, out ident);
   5.520                                  if (sts == Globals.ReturnStatus.Success)
   5.521                                  {
   5.522 -                                    newMessage.BCC.Add(ident);
   5.523 +                                    newMessage.Bcc.Add(ident);
   5.524                                  }
   5.525                                  else
   5.526                                  {
   5.527 @@ -1921,7 +1921,7 @@
   5.528                                          status = sts;
   5.529                                      }
   5.530  
   5.531 -                                    Log.Error("PEPMessage.Create: Failure creating 'BCC' identity.");
   5.532 +                                    Log.Error("PEPMessage.Create: Failure creating 'Bcc' identity.");
   5.533                                  }
   5.534  
   5.535                                  break;
   5.536 @@ -1931,7 +1931,7 @@
   5.537                                  sts = PEPIdentity.Create(currRecipient, out ident);
   5.538                                  if (sts == Globals.ReturnStatus.Success)
   5.539                                  {
   5.540 -                                    newMessage.CC.Add(ident);
   5.541 +                                    newMessage.Cc.Add(ident);
   5.542                                  }
   5.543                                  else
   5.544                                  {
   5.545 @@ -1941,7 +1941,7 @@
   5.546                                          status = sts;
   5.547                                      }
   5.548  
   5.549 -                                    Log.Error("PEPMessage.Create: Failure creating 'CC' identity.");
   5.550 +                                    Log.Error("PEPMessage.Create: Failure creating 'Cc' identity.");
   5.551                                  }
   5.552  
   5.553                                  break;
   5.554 @@ -1993,7 +1993,7 @@
   5.555                      Log.Error("PEPMessage.Create: Failure creating 'From' identity.");
   5.556                  }
   5.557  
   5.558 -                newMessage.ID = (string)MAPIHelper.GetProperty(omi, MAPIProperty.PidTagInternetMessageId, "");
   5.559 +                newMessage.Id = (string)MAPIHelper.GetProperty(omi, MAPIProperty.PidTagInternetMessageId, "");
   5.560                  newMessage.ShortMsg = omi.Subject;
   5.561  
   5.562                  /* Date & Times
   5.563 @@ -2021,7 +2021,7 @@
   5.564                  newMessage.SentOn = sentOn;
   5.565  
   5.566                  // Conversation information
   5.567 -                newMessage.ConversationID = omi.ConversationID;
   5.568 +                newMessage.ConversationId = omi.ConversationID;
   5.569                  newMessage.ConversationIndex = omi.ConversationIndex;
   5.570                  newMessage.ConversationTopic = omi.ConversationTopic;
   5.571  
     6.1 --- a/PEPSettings.cs	Wed Oct 05 23:58:06 2016 +0200
     6.2 +++ b/PEPSettings.cs	Thu Oct 06 19:44:58 2016 +0200
     6.3 @@ -26,8 +26,8 @@
     6.4          public const string REG_KEY_ACCOUNT_SETTINGS_LIST                       = "AccountSettingsList";
     6.5          public const string REG_NAME_ACCOUNT_SETTING_IS_PEP_ENABLED             = "IsPEPEnabled";
     6.6          public const string REG_NAME_ACCOUNT_SETTING_IS_SECURE_STORAGE_ENABLED  = "IsSecureStorageEnabled";
     6.7 -        public const string REG_NAME_ACCOUNT_SETTING_SENT_FOLDER_ENTRYID        = "SentFolderEntryID";
     6.8 -        public const string REG_NAME_ACCOUNT_SETTING_SMTP_ADDRESS               = "SMTPAddress";
     6.9 +        public const string REG_NAME_ACCOUNT_SETTING_SENT_FOLDER_ENTRYID        = "SentFolderEntryId";
    6.10 +        public const string REG_NAME_ACCOUNT_SETTING_SMTP_ADDRESS               = "SmtpAddress";
    6.11          public const string REG_NAME_ACCOUNT_SETTING_TYPE                       = "Type";
    6.12          public const string REG_NAME_ACCOUNT_WHITELIST                          = "AccountWhitelist";
    6.13          public const string REG_NAME_CRASH_REPORT_SEND_ADDRESS                  = "CrashReportSendAddress";
    6.14 @@ -436,7 +436,7 @@
    6.15              if (string.IsNullOrEmpty(smtpAddress) == false)
    6.16              {
    6.17                  tmp = new PEPAccountSettings();
    6.18 -                tmp.SMTPAddress = smtpAddress;
    6.19 +                tmp.SmtpAddress = smtpAddress;
    6.20                  tmp.Type = type;
    6.21  
    6.22                  foreach (PEPAccountSettings acctSettings in this._AccountSettingsList)
    6.23 @@ -552,18 +552,18 @@
    6.24                                  {
    6.25                                      try
    6.26                                      {
    6.27 -                                        if (string.IsNullOrWhiteSpace(acctSettings.SMTPAddress) == false)
    6.28 +                                        if (string.IsNullOrWhiteSpace(acctSettings.SmtpAddress) == false)
    6.29                                          {
    6.30 -                                            using (RegistryKey keyAcctSettings = keyAcctSettingsList.CreateSubKey(acctSettings.SMTPAddress))
    6.31 +                                            using (RegistryKey keyAcctSettings = keyAcctSettingsList.CreateSubKey(acctSettings.SmtpAddress))
    6.32                                              {
    6.33                                                  keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_IS_SECURE_STORAGE_ENABLED, acctSettings.IsSecureStorageEnabled.ToString(), RegistryValueKind.String);
    6.34                                                  keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_IS_PEP_ENABLED, acctSettings.IsPEPEnabled.ToString(), RegistryValueKind.String);
    6.35  
    6.36 -                                                if (acctSettings.SentFolderEntryID != null)
    6.37 -                                                { keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SENT_FOLDER_ENTRYID, acctSettings.SentFolderEntryID, RegistryValueKind.String); }
    6.38 +                                                if (acctSettings.SentFolderEntryId != null)
    6.39 +                                                { keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SENT_FOLDER_ENTRYID, acctSettings.SentFolderEntryId, RegistryValueKind.String); }
    6.40  
    6.41 -                                                if (acctSettings.SMTPAddress != null)
    6.42 -                                                { keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SMTP_ADDRESS, acctSettings.SMTPAddress, RegistryValueKind.String); }
    6.43 +                                                if (acctSettings.SmtpAddress != null)
    6.44 +                                                { keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SMTP_ADDRESS, acctSettings.SmtpAddress, RegistryValueKind.String); }
    6.45  
    6.46                                                  if (acctSettings.Type != null)
    6.47                                                  { keyAcctSettings.SetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_TYPE, acctSettings.Type, RegistryValueKind.String); }
    6.48 @@ -735,24 +735,24 @@
    6.49                                                      }
    6.50                                                  }
    6.51  
    6.52 -                                                // SentFolderEntryID
    6.53 +                                                // SentFolderEntryId
    6.54                                                  value = keyAcctSettings.GetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SENT_FOLDER_ENTRYID, null);
    6.55                                                  if (value != null)
    6.56                                                  {
    6.57                                                      if (string.IsNullOrWhiteSpace((string)value) == false)
    6.58                                                      {
    6.59 -                                                        acctSettings.SentFolderEntryID = ((string)value).Trim();
    6.60 +                                                        acctSettings.SentFolderEntryId = ((string)value).Trim();
    6.61                                                          isPropertySet = true;
    6.62                                                      }
    6.63                                                  }
    6.64  
    6.65 -                                                // SMTPAddress
    6.66 +                                                // SmtpAddress
    6.67                                                  value = keyAcctSettings.GetValue(PEPSettings.REG_NAME_ACCOUNT_SETTING_SMTP_ADDRESS, null);
    6.68                                                  if (value != null)
    6.69                                                  {
    6.70                                                      if (string.IsNullOrWhiteSpace((string)value) == false)
    6.71                                                      {
    6.72 -                                                        acctSettings.SMTPAddress = ((string)value).Trim();
    6.73 +                                                        acctSettings.SmtpAddress = ((string)value).Trim();
    6.74                                                          isPropertySet = true;
    6.75                                                      }
    6.76                                                  }
    6.77 @@ -832,7 +832,7 @@
    6.78                                  if (existingAcctSettings == null)
    6.79                                  {
    6.80                                      acctSettings = new PEPAccountSettings();
    6.81 -                                    acctSettings.SMTPAddress = entry.Key;
    6.82 +                                    acctSettings.SmtpAddress = entry.Key;
    6.83                                      acctSettings.IsSecureStorageEnabled = entry.Value;
    6.84  
    6.85                                      this._AccountSettingsList.Add(acctSettings);
    6.86 @@ -1355,8 +1355,8 @@
    6.87  
    6.88              private bool   _IsPEPEnabled;
    6.89              private bool   _IsSecureStorageEnabled;
    6.90 -            private string _SentFolderEntryID;
    6.91 -            private string _SMTPAddress;
    6.92 +            private string _SentFolderEntryId;
    6.93 +            private string _SmtpAddress;
    6.94              private string _Type;
    6.95  
    6.96              /**************************************************************
    6.97 @@ -1381,8 +1381,8 @@
    6.98              {
    6.99                  this.Reset();
   6.100  
   6.101 -                this._SMTPAddress = smtpAddress;
   6.102 -                this.RaisePropertyChangedEvent(nameof(this.SMTPAddress));
   6.103 +                this._SmtpAddress = smtpAddress;
   6.104 +                this.RaisePropertyChangedEvent(nameof(this.SmtpAddress));
   6.105              }
   6.106  
   6.107              /**************************************************************
   6.108 @@ -1422,13 +1422,13 @@
   6.109              /// Gets or sets the EntryID (if defined) for the Sent folder of the account.
   6.110              /// This is only used as an override if the default sent folder does not exist.
   6.111              /// </summary>
   6.112 -            public string SentFolderEntryID
   6.113 +            public string SentFolderEntryId
   6.114              {
   6.115 -                get { return (this._SentFolderEntryID); }
   6.116 +                get { return (this._SentFolderEntryId); }
   6.117                  set
   6.118                  {
   6.119 -                    this._SentFolderEntryID = value;
   6.120 -                    this.RaisePropertyChangedEvent(nameof(this.SentFolderEntryID));
   6.121 +                    this._SentFolderEntryId = value;
   6.122 +                    this.RaisePropertyChangedEvent(nameof(this.SentFolderEntryId));
   6.123                  }
   6.124              }
   6.125  
   6.126 @@ -1436,13 +1436,13 @@
   6.127              /// Gets or sets the SMTP address of the account.
   6.128              /// This is used to associate settings with an Outlook account.
   6.129              /// </summary>
   6.130 -            public string SMTPAddress
   6.131 +            public string SmtpAddress
   6.132              {
   6.133 -                get { return (this._SMTPAddress); }
   6.134 +                get { return (this._SmtpAddress); }
   6.135                  set
   6.136                  {
   6.137 -                    this._SMTPAddress = value;
   6.138 -                    this.RaisePropertyChangedEvent(nameof(this.SMTPAddress));
   6.139 +                    this._SmtpAddress = value;
   6.140 +                    this.RaisePropertyChangedEvent(nameof(this.SmtpAddress));
   6.141                  }
   6.142              }
   6.143  
   6.144 @@ -1483,14 +1483,14 @@
   6.145              {
   6.146                  this._IsPEPEnabled = PEPSettings.ACCOUNT_SETTING_IS_PEP_ENABLED_DEFAULT;
   6.147                  this._IsSecureStorageEnabled = PEPSettings.ACCOUNT_SETTING_IS_SECURE_STORAGE_ENABLED_DEFAULT;
   6.148 -                this._SentFolderEntryID = PEPSettings.ACCOUNT_SETTING_SENT_FOLDER_ENTRYID_DEFAULT;
   6.149 -                this._SMTPAddress = PEPSettings.ACCOUNT_SETTING_SMTP_ADDRESS_DEFAULT;
   6.150 +                this._SentFolderEntryId = PEPSettings.ACCOUNT_SETTING_SENT_FOLDER_ENTRYID_DEFAULT;
   6.151 +                this._SmtpAddress = PEPSettings.ACCOUNT_SETTING_SMTP_ADDRESS_DEFAULT;
   6.152                  this._Type = PEPSettings.ACCOUNT_SETTING_TYPE_DEFAULT;
   6.153  
   6.154                  this.RaisePropertyChangedEvent(nameof(this.IsPEPEnabled));
   6.155                  this.RaisePropertyChangedEvent(nameof(this.IsSecureStorageEnabled));
   6.156 -                this.RaisePropertyChangedEvent(nameof(this.SentFolderEntryID));
   6.157 -                this.RaisePropertyChangedEvent(nameof(this.SMTPAddress));
   6.158 +                this.RaisePropertyChangedEvent(nameof(this.SentFolderEntryId));
   6.159 +                this.RaisePropertyChangedEvent(nameof(this.SmtpAddress));
   6.160                  this.RaisePropertyChangedEvent(nameof(this.Type));
   6.161  
   6.162                  return;
   6.163 @@ -1506,8 +1506,8 @@
   6.164  
   6.165                  copy.IsPEPEnabled = this._IsPEPEnabled;
   6.166                  copy.IsSecureStorageEnabled = this._IsSecureStorageEnabled;
   6.167 -                copy.SentFolderEntryID = this._SentFolderEntryID;
   6.168 -                copy.SMTPAddress = this._SMTPAddress;
   6.169 +                copy.SentFolderEntryId = this._SentFolderEntryId;
   6.170 +                copy.SmtpAddress = this._SmtpAddress;
   6.171                  copy.Type = this._Type;
   6.172  
   6.173                  return (copy);
   6.174 @@ -1524,10 +1524,10 @@
   6.175                  bool areEqual = false;
   6.176  
   6.177                  if ((obj != null) &&
   6.178 -                    (string.IsNullOrEmpty(obj.SMTPAddress) == false) &&
   6.179 -                    (string.IsNullOrEmpty(this._SMTPAddress) == false))
   6.180 +                    (string.IsNullOrEmpty(obj.SmtpAddress) == false) &&
   6.181 +                    (string.IsNullOrEmpty(this._SmtpAddress) == false))
   6.182                  {
   6.183 -                    areEqual = string.Equals(obj.SMTPAddress.Trim(), this._SMTPAddress.Trim(), StringComparison.OrdinalIgnoreCase);
   6.184 +                    areEqual = string.Equals(obj.SmtpAddress.Trim(), this._SmtpAddress.Trim(), StringComparison.OrdinalIgnoreCase);
   6.185                  }
   6.186  
   6.187                  return (areEqual);
   6.188 @@ -1544,11 +1544,11 @@
   6.189                  bool areEqual = false;
   6.190  
   6.191                  if ((obj != null) &&
   6.192 -                    (string.IsNullOrEmpty(obj.SMTPAddress) == false) &&
   6.193 -                    (string.IsNullOrEmpty(this._SMTPAddress) == false))
   6.194 +                    (string.IsNullOrEmpty(obj.SmtpAddress) == false) &&
   6.195 +                    (string.IsNullOrEmpty(this._SmtpAddress) == false))
   6.196                  {
   6.197                      // Compare address
   6.198 -                    if (string.Equals(obj.SMTPAddress.Trim(), this._SMTPAddress.Trim(), StringComparison.OrdinalIgnoreCase))
   6.199 +                    if (string.Equals(obj.SmtpAddress.Trim(), this._SmtpAddress.Trim(), StringComparison.OrdinalIgnoreCase))
   6.200                      {
   6.201                          // Addresses are equal, now compare type
   6.202                          if ((string.IsNullOrEmpty(obj.Type) == false) &&
     7.1 --- a/ThisAddIn.cs	Wed Oct 05 23:58:06 2016 +0200
     7.2 +++ b/ThisAddIn.cs	Thu Oct 06 19:44:58 2016 +0200
     7.3 @@ -37,7 +37,7 @@
     7.4  
     7.5          private bool                       initialized        = false;
     7.6          private FormControlOptions.State   lastOptionsState   = null;
     7.7 -        private Dictionary<string, string> userIDCache        = new Dictionary<string, string>();
     7.8 +        private Dictionary<string, string> userIdCache        = new Dictionary<string, string>();
     7.9          private List<WatchedSentFolder>    watchedSentFolders = new List<WatchedSentFolder>();
    7.10          private AdapterCallbacks           adapterCallbacks;
    7.11  
    7.12 @@ -184,7 +184,7 @@
    7.13                      {
    7.14                          existingAcctSettings = this._Settings.AccountSettingsList[i];
    7.15  
    7.16 -                        if ((string.IsNullOrEmpty(existingAcctSettings.SMTPAddress) == false) &&
    7.17 +                        if ((string.IsNullOrEmpty(existingAcctSettings.SmtpAddress) == false) &&
    7.18                              (string.IsNullOrEmpty(existingAcctSettings.Type) == true))
    7.19                          {
    7.20                              legacyAcctSettings.Add(existingAcctSettings);
    7.21 @@ -200,11 +200,11 @@
    7.22                          if (string.IsNullOrWhiteSpace(acct.SmtpAddress) == false)
    7.23                          {
    7.24                              newAcctSettings = new PEPSettings.PEPAccountSettings();
    7.25 -                            newAcctSettings.SMTPAddress = acct.SmtpAddress;
    7.26 +                            newAcctSettings.SmtpAddress = acct.SmtpAddress;
    7.27                              newAcctSettings.Type = acct.AccountType.ToString();
    7.28  
    7.29                              // Check if it already exists in the list
    7.30 -                            existingAcctSettings = this._Settings.GetAccountSettings(newAcctSettings.SMTPAddress, newAcctSettings.Type);
    7.31 +                            existingAcctSettings = this._Settings.GetAccountSettings(newAcctSettings.SmtpAddress, newAcctSettings.Type);
    7.32                              if (existingAcctSettings == null)
    7.33                              {
    7.34                                  this._Settings.AccountSettingsList.Add(newAcctSettings);
    7.35 @@ -231,7 +231,7 @@
    7.36                          {
    7.37                              acct = accounts[j];
    7.38                              newAcctSettings = new PEPSettings.PEPAccountSettings();
    7.39 -                            newAcctSettings.SMTPAddress = acct.SmtpAddress;
    7.40 +                            newAcctSettings.SmtpAddress = acct.SmtpAddress;
    7.41                              newAcctSettings.Type = acct.AccountType.ToString();
    7.42  
    7.43                              if (existingAcctSettings.EqualsByAddressAndType(newAcctSettings))
    7.44 @@ -403,7 +403,7 @@
    7.45                  me = new pEpIdentity();
    7.46                  me.Address = acct.SmtpAddress;
    7.47                  me.UserName = (currUser != null ? currUser.Name : null);
    7.48 -                me.UserId = Globals.ThisAddIn.GetUserID(me.Address, null);
    7.49 +                me.UserId = Globals.ThisAddIn.GetUserId(me.Address, null);
    7.50  
    7.51                  // Log information if invalid
    7.52                  if (string.IsNullOrWhiteSpace(me.Address))
    7.53 @@ -413,7 +413,7 @@
    7.54  
    7.55                  if (string.IsNullOrWhiteSpace(me.UserName))
    7.56                  {
    7.57 -                    Log.Warning("RegisterMyself: Myself[" + i.ToString() + "] doesn't have a username.");
    7.58 +                    Log.Warning("RegisterMyself: Myself[" + i.ToString() + "] doesn't have a user name.");
    7.59                  }
    7.60  
    7.61                  // Call engine
    7.62 @@ -475,7 +475,7 @@
    7.63          /// <param name="contact">The contact associated with the address (if any).
    7.64          /// This value can be null and is not required for 'myself' user IDs.</param>
    7.65          /// <returns>The user ID (Outlook EntryID) for the given address</returns>
    7.66 -        internal string GetUserID(string address,
    7.67 +        internal string GetUserId(string address,
    7.68                                    Outlook.ContactItem contact)
    7.69          {
    7.70              string id = null;
    7.71 @@ -490,7 +490,7 @@
    7.72                      {
    7.73                          try
    7.74                          {
    7.75 -                            id = this.userIDCache[address];
    7.76 +                            id = this.userIdCache[address];
    7.77                          }
    7.78                          catch
    7.79                          {
    7.80 @@ -505,7 +505,7 @@
    7.81                          if (PEPIdentity.GetIsOwnIdentity(address))
    7.82                          {
    7.83                              id = "pEp_own_userId"; // Alternatively, null or empty could be used
    7.84 -                            this.userIDCache[address] = id;
    7.85 +                            this.userIdCache[address] = id;
    7.86                          }
    7.87                      }
    7.88  
    7.89 @@ -517,11 +517,11 @@
    7.90                          {
    7.91                              contactFolder = (Outlook.Folder)contact.Parent;
    7.92                              id = contactFolder.StoreID.ToUpper() + "_" + contact.EntryID.ToUpper();
    7.93 -                            this.userIDCache[address] = id;
    7.94 +                            this.userIdCache[address] = id;
    7.95                          }
    7.96                          catch
    7.97                          {
    7.98 -                            Log.Error("GetUserID: Attempted to use contact but failed.");
    7.99 +                            Log.Error("GetUserId: Attempted to use contact but failed.");
   7.100                          }
   7.101                      }
   7.102  
   7.103 @@ -660,9 +660,9 @@
   7.104                      {
   7.105                          try
   7.106                          {
   7.107 -                            //Search for folder by EntryID 
   7.108 -                            /* Normally, the way to go would be the following line:
   7.109 -                             * sentFolder = (Outlook.Folder)ns.GetItemFromID(acctSettings.SentFolderEntryID, sendingStore.StoreID);
   7.110 +                            /* Search for folder by entry ID
   7.111 +                             * Normally, the way to go would be the following line:
   7.112 +                             * sentFolder = (Outlook.Folder)ns.GetItemFromID(acctSettings.SentFolderEntryId, sendingStore.StoreID);
   7.113                               * However, for some reason, this can come up with the following error: "Could not open the item. Try again."
   7.114                               * Therefore, the below solution is used:
   7.115                               */
   7.116 @@ -675,7 +675,7 @@
   7.117                                      if (folder != null)
   7.118                                      {
   7.119                                          if ((string.IsNullOrEmpty(folder.EntryID) == false) &&
   7.120 -                                            (string.Equals(folder.EntryID, acctSettings.SentFolderEntryID)))
   7.121 +                                            (string.Equals(folder.EntryID, acctSettings.SentFolderEntryId)))
   7.122                                          {
   7.123                                              sentFolder = folder;
   7.124                                              break;
   7.125 @@ -759,7 +759,7 @@
   7.126  
   7.127                      if (sentFolder != null)
   7.128                      {
   7.129 -                        acctSettings.SentFolderEntryID = sentFolder.EntryID;
   7.130 +                        acctSettings.SentFolderEntryId = sentFolder.EntryID;
   7.131  
   7.132                          // Create the basic sent mail item
   7.133                          sentMailItem = (Outlook.MailItem)sentFolder.Items.Add(Outlook.OlItemType.olMailItem);
   7.134 @@ -1018,12 +1018,12 @@
   7.135                       * This isn't always user friendly so for the options UI the 'ol' is removed.
   7.136                       * However, when comparing again with the settings list, this 'ol' must be added back.
   7.137                       */
   7.138 -                    acctSettings = this._Settings.GetAccountSettings(entry.SMTPAddress, ("ol" + entry.Type));
   7.139 +                    acctSettings = this._Settings.GetAccountSettings(entry.SmtpAddress, ("ol" + entry.Type));
   7.140  
   7.141                      if (acctSettings != null)
   7.142                      {
   7.143                          // Modify existing value
   7.144 -                        // The following are skipped: SentFolderEntryID, SMTPAddress & Type
   7.145 +                        // The following are skipped: SentFolderEntryId, SmtpAddress & Type
   7.146                          acctSettings.IsPEPEnabled = entry.IsPEPEnabled;
   7.147                          acctSettings.IsSecureStorageEnabled = entry.IsSecureStorageEnabled;
   7.148                      }
   7.149 @@ -2745,7 +2745,7 @@
   7.150                                              {
   7.151                                                  acctSettings = new PEPSettings.PEPAccountSettings
   7.152                                                  {
   7.153 -                                                    SMTPAddress = sendingAccount.SmtpAddress,
   7.154 +                                                    SmtpAddress = sendingAccount.SmtpAddress,
   7.155                                                      Type = sendingAccount.AccountType.ToString()
   7.156                                                  };
   7.157                                                  this._Settings.AccountSettingsList.Add(acctSettings);
     8.1 --- a/UI/FormControlOptions.xaml	Wed Oct 05 23:58:06 2016 +0200
     8.2 +++ b/UI/FormControlOptions.xaml	Thu Oct 06 19:44:58 2016 +0200
     8.3 @@ -206,7 +206,7 @@
     8.4                                                     Grid.ColumnSpan="2"
     8.5                                                     Grid.Row="0"
     8.6                                                     HorizontalAlignment="Left"
     8.7 -                                                   Text="{Binding Path=SMTPAddress, Mode=OneWay}" />
     8.8 +                                                   Text="{Binding Path=SmtpAddress, Mode=OneWay}" />
     8.9                                          <TextBlock Grid.Column="0"
    8.10                                                     Grid.ColumnSpan="2"
    8.11                                                     Grid.Row="0"
     9.1 --- a/UI/FormControlOptions.xaml.cs	Wed Oct 05 23:58:06 2016 +0200
     9.2 +++ b/UI/FormControlOptions.xaml.cs	Thu Oct 06 19:44:58 2016 +0200
     9.3 @@ -1362,11 +1362,11 @@
     9.4                          {
     9.5                              fpr2 = Globals.ThisAddIn.RemoveFprFormatting(entry.Key.Fingerprint);
     9.6  
     9.7 -                            // Match by username, address or fingerprint. All case-insensitive
     9.8 +                            // Match by user name, address or fingerprint. All case-insensitive
     9.9                              if (((string.IsNullOrEmpty(entry.Key.Address) == false) &&
    9.10                                   (entry.Key.Address.ToUpper().Contains(criteria))) ||
    9.11 -                                ((string.IsNullOrEmpty(entry.Key.Username) == false) &&
    9.12 -                                 (entry.Key.Username.ToUpper().Contains(criteria))) ||
    9.13 +                                ((string.IsNullOrEmpty(entry.Key.UserName) == false) &&
    9.14 +                                 (entry.Key.UserName.ToUpper().Contains(criteria))) ||
    9.15                                  ((string.IsNullOrEmpty(fpr2) == false) &&
    9.16                                   ((fpr2.StartsWith(fpr1)) ||
    9.17                                    ((fpr2.Length == 40) &&
    10.1 --- a/UI/FormRegionPreviewUnencrypted.cs	Wed Oct 05 23:58:06 2016 +0200
    10.2 +++ b/UI/FormRegionPreviewUnencrypted.cs	Thu Oct 06 19:44:58 2016 +0200
    10.3 @@ -212,16 +212,16 @@
    10.4                      }
    10.5                      else
    10.6                      {
    10.7 -                        // Add any CC (skip BCC)
    10.8 -                        for (int i = 0; i < message.CC.Count; i++)
    10.9 +                        // Add any Cc (skip Bcc)
   10.10 +                        for (int i = 0; i < message.Cc.Count; i++)
   10.11                          {
   10.12 -                            if (i == (message.CC.Count - 1))
   10.13 +                            if (i == (message.Cc.Count - 1))
   10.14                              {
   10.15 -                                recipientText += message.CC[i].ToDisplayString();
   10.16 +                                recipientText += message.Cc[i].ToDisplayString();
   10.17                              }
   10.18                              else
   10.19                              {
   10.20 -                                recipientText += message.CC[i].ToDisplayString() + "; ";
   10.21 +                                recipientText += message.Cc[i].ToDisplayString() + "; ";
   10.22                              }
   10.23                          }
   10.24                      }
    11.1 --- a/UI/FormRegionPrivacyStatus.cs	Wed Oct 05 23:58:06 2016 +0200
    11.2 +++ b/UI/FormRegionPrivacyStatus.cs	Thu Oct 06 19:44:58 2016 +0200
    11.3 @@ -455,7 +455,7 @@
    11.4                                                           Globals.ThisAddIn.Settings.TrustwordsCulture?.TwoLetterISOLanguageName);
    11.5  
    11.6                          item = new SelectionItem();
    11.7 -                        item.TextLine1 = partnerIdentity.Username;
    11.8 +                        item.TextLine1 = partnerIdentity.UserName;
    11.9                          item.TextLine2 = partnerIdentity.Address;
   11.10                          item.Tag = (string.IsNullOrWhiteSpace(partnerIdentity.Fingerprint) ? null : trustwordsShort);
   11.11  
   11.12 @@ -574,7 +574,7 @@
   11.13                      else // Invalid identity
   11.14                      {
   11.15                          item = new SelectionItem();
   11.16 -                        item.TextLine1 = ident.Username;
   11.17 +                        item.TextLine1 = ident.UserName;
   11.18                          item.TextLine2 = ident.Address;
   11.19                          item.ItemImage = null;
   11.20                          item.IsTwoTextLinesVisible = true;