diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 622f15b51..27cee8ba9 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -1111,9 +1111,7 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc";
           tmpIdentity = [NSMutableDictionary dictionaryWithDictionary: identity];
           if ([tmpIdentity objectForKey: @"signature"]) {
             // Add raw html embed class
-            if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"<table"].location != NSNotFound 
-              && [[tmpIdentity objectForKey: @"signature"] rangeOfString:@"<figure class=\"table\""].location == NSNotFound
-              && [[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound) {
+            if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound) {
               signature = [NSString stringWithFormat:@"<div class=\"raw-html-embed\">%@</div>", [tmpIdentity objectForKey: @"signature"]];
               [tmpIdentity setObject:signature forKey:@"signature"];
             }