diff --git a/Vector/Views/Device/DeviceTableViewCell.m b/Vector/Views/Device/DeviceTableViewCell.m
index 7232debaa..9b3381d86 100644
--- a/Vector/Views/Device/DeviceTableViewCell.m
+++ b/Vector/Views/Device/DeviceTableViewCell.m
@@ -1,6 +1,7 @@
 /*
  Copyright 2016 OpenMarket Ltd
- 
+ Copyright 2017 Vector Creations Ltd
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -49,6 +50,7 @@
     
     switch (deviceInfo.verified)
     {
+        case MXDeviceUnknown:
         case MXDeviceUnverified:
         {
             self.deviceStatus.image = [UIImage imageNamed:@"e2e_warning"];
diff --git a/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m b/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m
index 75dd7a335..37881a14f 100644
--- a/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m
+++ b/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m
@@ -1,5 +1,6 @@
 /*
  Copyright 2016 OpenMarket Ltd
+ Copyright 2017 Vector Creations Ltd
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -51,6 +52,7 @@ NSString *const kRoomEncryptedDataBubbleCellTapOnEncryptionIcon = @"kRoomEncrypt
         {
             switch (deviceInfo.verified)
             {
+                case MXDeviceUnknown:
                 case MXDeviceUnverified:
                 {
                     encryptionIcon = @"e2e_warning";