diff --git a/Riot/Managers/Theme/ThemeService.h b/Riot/Managers/Theme/ThemeService.h
index b10e6cb7f..7fcaff121 100644
--- a/Riot/Managers/Theme/ThemeService.h
+++ b/Riot/Managers/Theme/ThemeService.h
@@ -59,6 +59,10 @@ extern NSString *const kThemeServiceDidChangeThemeNotification;
  */
 - (id<Theme>)themeWithThemeId:(NSString*)themeId;
 
+
+/// Retrun YES if the current is Dark or Black
+- (BOOL)isCurrentThemeDark;
+
 #pragma mark - Riot Colors not yet themeable
 
 @property (nonatomic, readonly) UIColor *riotColorCuriousBlue;
diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m
index de494bb23..f29dbcaab 100644
--- a/Riot/Managers/Theme/ThemeService.m
+++ b/Riot/Managers/Theme/ThemeService.m
@@ -95,6 +95,16 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan
     return theme;
 }
 
+- (BOOL)isCurrentThemeDark
+{
+    if ([self.theme.identifier isEqualToString:@"dark"] || [self.theme.identifier isEqualToString:@"black"])
+    {
+        return YES;
+    }
+    
+    return NO;
+}
+
 #pragma mark - Private methods
 
 - (instancetype)init