diff --git a/modules/oa_messages/oa_messages.features.field_base.inc b/modules/oa_messages/oa_messages.features.field_base.inc
index 2b3f54a..d3f23ca 100644
--- a/modules/oa_messages/oa_messages.features.field_base.inc
+++ b/modules/oa_messages/oa_messages.features.field_base.inc
@@ -66,6 +66,47 @@ function oa_messages_field_default_field_bases() {
     'type' => 'text',
   );
 
+  // Exported field_base: 'field_oa_comment_ref'
+  $field_bases['field_oa_comment_ref'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_oa_comment_ref',
+    'foreign keys' => array(
+      'node' => array(
+        'columns' => array(
+          'target_id' => 'nid',
+        ),
+        'table' => 'node',
+      ),
+    ),
+    'indexes' => array(
+      'target_id' => array(
+        0 => 'target_id',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'entityreference',
+    'settings' => array(
+      'handler' => 'base',
+      'handler_settings' => array(
+        'behaviors' => array(
+          'views-select-list' => array(
+            'status' => 0,
+          ),
+        ),
+        'sort' => array(
+          'type' => 'none',
+        ),
+        'target_bundles' => array(),
+      ),
+      'target_type' => 'comment',
+    ),
+    'translatable' => 0,
+    'type' => 'entityreference',
+  );
+
   // Exported field_base: 'field_oa_message_section'
   $field_bases['field_oa_message_section'] = array(
     'active' => 1,
diff --git a/modules/oa_messages/oa_messages.features.field_instance.inc b/modules/oa_messages/oa_messages.features.field_instance.inc
index 035f604..cf9de5f 100644
--- a/modules/oa_messages/oa_messages.features.field_instance.inc
+++ b/modules/oa_messages/oa_messages.features.field_instance.inc
@@ -10,6 +10,345 @@
 function oa_messages_field_default_field_instances() {
   $field_instances = array();
 
+  // Exported field_instance: 'message-oa_comment-field_oa_comment_ref'
+  $field_instances['message-oa_comment-field_oa_comment_ref'] = array(
+    'bundle' => 'oa_comment',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 6,
+      ),
+      'message_notify_email_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 5,
+      ),
+      'message_notify_email_subject' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 5,
+      ),
+      'oa_river_accordian' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 5,
+      ),
+      'oa_river_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 5,
+      ),
+      'oa_river_header' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 5,
+      ),
+    ),
+    'entity_type' => 'message',
+    'field_name' => 'field_oa_comment_ref',
+    'label' => 'Comment',
+    'options_limit' => FALSE,
+    'options_limit_empty_behaviour' => 0,
+    'options_limit_fields' => array(),
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 2,
+    ),
+  );
+
+  // Exported field_instance: 'message-oa_comment-field_oa_message_section'
+  $field_instances['message-oa_comment-field_oa_message_section'] = array(
+    'bundle' => 'oa_comment',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 2,
+      ),
+      'message_notify_email_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+      'message_notify_email_subject' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+      'oa_river_accordian' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+      'oa_river_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+      'oa_river_header' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+    ),
+    'entity_type' => 'message',
+    'field_name' => 'field_oa_message_section',
+    'label' => 'Section',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 4,
+    ),
+  );
+
+  // Exported field_instance: 'message-oa_comment-field_oa_message_space'
+  $field_instances['message-oa_comment-field_oa_message_space'] = array(
+    'bundle' => 'oa_comment',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 0,
+      ),
+      'message_notify_email_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 8,
+      ),
+      'message_notify_email_subject' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 8,
+      ),
+      'oa_river_accordian' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 8,
+      ),
+      'oa_river_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 8,
+      ),
+      'oa_river_header' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 8,
+      ),
+    ),
+    'entity_type' => 'message',
+    'field_name' => 'field_oa_message_space',
+    'label' => 'Space',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 3,
+    ),
+  );
+
+  // Exported field_instance: 'message-oa_comment-field_oa_message_text'
+  $field_instances['message-oa_comment-field_oa_message_text'] = array(
+    'bundle' => 'oa_comment',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 4,
+      ),
+      'message_notify_email_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 6,
+      ),
+      'message_notify_email_subject' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 6,
+      ),
+      'oa_river_accordian' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 6,
+      ),
+      'oa_river_body' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 6,
+      ),
+      'oa_river_header' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 6,
+      ),
+    ),
+    'entity_type' => 'message',
+    'field_name' => 'field_oa_message_text',
+    'label' => 'Custom Text',
+    'required' => 0,
+    'settings' => array(
+      'linkit' => array(
+        'enable' => 0,
+        'insert_plugin' => '',
+      ),
+      'text_processing' => 1,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'rows' => 5,
+      ),
+      'type' => 'text_textarea',
+      'weight' => 5,
+    ),
+  );
+
+  // Exported field_instance: 'message-oa_comment-field_oa_node_ref'
+  $field_instances['message-oa_comment-field_oa_node_ref'] = array(
+    'bundle' => 'oa_comment',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 5,
+      ),
+      'message_notify_email_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 9,
+      ),
+      'message_notify_email_subject' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 9,
+      ),
+      'oa_river_accordian' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 9,
+      ),
+      'oa_river_body' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 9,
+      ),
+      'oa_river_header' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 9,
+      ),
+    ),
+    'entity_type' => 'message',
+    'field_name' => 'field_oa_node_ref',
+    'label' => 'Node',
+    'required' => 1,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 0,
+    ),
+  );
+
   // Exported field_instance: 'message-oa_create-field_oa_message_section'
   $field_instances['message-oa_create-field_oa_message_section'] = array(
     'bundle' => 'oa_create',
@@ -1022,6 +1361,7 @@ function oa_messages_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
+  t('Comment');
   t('Custom Text');
   t('Node');
   t('Section');
diff --git a/modules/oa_messages/oa_messages.features.inc b/modules/oa_messages/oa_messages.features.inc
index 5aa7ab8..a09e8ab 100644
--- a/modules/oa_messages/oa_messages.features.inc
+++ b/modules/oa_messages/oa_messages.features.inc
@@ -7,8 +7,7 @@
 /**
  * Implements hook_ctools_plugin_api().
  */
-function oa_messages_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
+function oa_messages_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
@@ -19,6 +18,47 @@ function oa_messages_ctools_plugin_api() {
  */
 function oa_messages_default_message_type() {
   $items = array();
+  $items['oa_comment'] = entity_import('message_type', '{
+    "name" : "oa_comment",
+    "description" : "Comment",
+    "argument_keys" : [],
+    "argument" : [],
+    "category" : "message_type",
+    "data" : {
+      "token options" : { "clear" : 1 },
+      "purge" : { "override" : 0, "enabled" : 0, "quota" : "", "days" : "" }
+    },
+    "language" : "",
+    "arguments" : null,
+    "message_text" : { "und" : [
+        {
+          "value" : "[[message:field-oa-message-space]] @{message:user:name} replied to [message:field-oa-node-ref:title]",
+          "format" : "plain_text",
+          "safe_value" : "\\u003Cp\\u003E[[message:field-oa-message-space]] @{message:user:name} replied to [message:field-oa-node-ref:title]\\u003C\\/p\\u003E\\n"
+        },
+        {
+          "value" : "@{message:user:name} replied to \\u003Ca href=\\u0022\\/comment\\/[message:field-oa-comment-ref:cid]#comment-[message:field-oa-comment-ref:cid]\\u0022\\u003E[message:field-oa-node-ref:title]\\u003C\\/a\\u003E\\r\\n[message:field-oa-message-text:value] [message:field-oa-comment-ref:comment-body:value]\\r\\n\\u003Ca href=\\u0022[message:field-oa-node-ref:url]\\u0022\\u003EClick here\\u003C\\/a\\u003E to see the discussion.",
+          "format" : "full_html",
+          "safe_value" : "@{message:user:name} replied to \\u003Ca href=\\u0022\\/comment\\/[message:field-oa-comment-ref:cid]#comment-[message:field-oa-comment-ref:cid]\\u0022\\u003E[message:field-oa-node-ref:title]\\u003C\\/a\\u003E\\n[message:field-oa-message-text:value] [message:field-oa-comment-ref:comment-body:value]\\n\\u003Ca href=\\u0022[message:field-oa-node-ref:url]\\u0022\\u003EClick here\\u003C\\/a\\u003E to see the discussion."
+        },
+        {
+          "value" : "\\u003Ca href=\\u0022[site:url]user\\/@{message:user:uid}\\u0022 class=\\u0022oa-userlink\\u0022\\u003E@{message:user:name}\\u003C\\/a\\u003E replied to \\u003Ca href=\\u0022\\/comment\\/[message:field-oa-comment-ref:cid]#comment-[message:field-oa-comment-ref:cid]\\u0022\\u003E\\u003Cstrong\\u003E[message:field-oa-node-ref:title]\\u003C\\/strong\\u003E\\u003C\\/a\\u003E",
+          "format" : "full_html",
+          "safe_value" : "\\u003Ca href=\\u0022[site:url]user\\/@{message:user:uid}\\u0022 class=\\u0022oa-userlink\\u0022\\u003E@{message:user:name}\\u003C\\/a\\u003E replied to \\u003Ca href=\\u0022\\/comment\\/[message:field-oa-comment-ref:cid]#comment-[message:field-oa-comment-ref:cid]\\u0022\\u003E\\u003Cstrong\\u003E[message:field-oa-node-ref:title]\\u003C\\/strong\\u003E\\u003C\\/a\\u003E"
+        },
+        {
+          "value" : "[message:field-oa-message-text:value] [message:field-oa-node-ref:title]",
+          "format" : "panopoly_html_text",
+          "safe_value" : "\\u003Cp\\u003E[message:field-oa-message-text:value] [message:field-oa-node-ref:title]\\u003C\\/p\\u003E\\n"
+        },
+        {
+          "value" : "[message:field-oa-comment-ref:comment-body:value]",
+          "format" : "panopoly_html_text",
+          "safe_value" : "\\u003Cp\\u003E[message:field-oa-comment-ref:comment-body:value]\\u003C\\/p\\u003E\\n"
+        }
+      ]
+    }
+  }');
   $items['oa_create'] = entity_import('message_type', '{
     "name" : "oa_create",
     "description" : "Create Content",
diff --git a/modules/oa_messages/oa_messages.info b/modules/oa_messages/oa_messages.info
index 300fd75..fd3d05b 100644
--- a/modules/oa_messages/oa_messages.info
+++ b/modules/oa_messages/oa_messages.info
@@ -2,7 +2,6 @@ name = Open Atrium Messages
 description = Message types for Open Atrium
 core = 7.x
 package = Open Atrium
-php = 5.2.4
 version = 7.x-2.0
 project = oa_messages
 dependencies[] = ctools
@@ -22,10 +21,16 @@ features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
 features[field_base][] = field_deleted_summary
 features[field_base][] = field_deleted_title
+features[field_base][] = field_oa_comment_ref
 features[field_base][] = field_oa_message_section
 features[field_base][] = field_oa_message_space
 features[field_base][] = field_oa_message_text
 features[field_base][] = field_oa_node_ref
+features[field_instance][] = message-oa_comment-field_oa_comment_ref
+features[field_instance][] = message-oa_comment-field_oa_message_section
+features[field_instance][] = message-oa_comment-field_oa_message_space
+features[field_instance][] = message-oa_comment-field_oa_message_text
+features[field_instance][] = message-oa_comment-field_oa_node_ref
 features[field_instance][] = message-oa_create-field_oa_message_section
 features[field_instance][] = message-oa_create-field_oa_message_space
 features[field_instance][] = message-oa_create-field_oa_message_text
@@ -41,14 +46,15 @@ features[field_instance][] = message-oa_update-field_oa_message_section
 features[field_instance][] = message-oa_update-field_oa_message_space
 features[field_instance][] = message-oa_update-field_oa_message_text
 features[field_instance][] = message-oa_update-field_oa_node_ref
+features[message_type][] = oa_comment
 features[message_type][] = oa_create
 features[message_type][] = oa_delete
 features[message_type][] = oa_member
 features[message_type][] = oa_update
+features[variable][] = field_bundle_settings_message__oa_comment
 features[variable][] = field_bundle_settings_message__oa_create
 features[variable][] = field_bundle_settings_message__oa_delete
 features[variable][] = field_bundle_settings_message__oa_member
 features[variable][] = field_bundle_settings_message__oa_update
-files[] = plugins/feeds/plugins/OaMailParser.class.php
-files[] = plugins/feeds/plugins/OaMailParser.inc
+files[] = plugins/message_notify/notifier/oa_email/OaEmail.class.php
 project path = sites/all/modules/contrib/oa_core/modules
diff --git a/modules/oa_messages/oa_messages.module b/modules/oa_messages/oa_messages.module
index 8679dac..81b9bac 100644
--- a/modules/oa_messages/oa_messages.module
+++ b/modules/oa_messages/oa_messages.module
@@ -228,6 +228,19 @@ function oa_messages_node_delete($node) {
 }
 
 /**
+ * Implements hook_comment_insert().
+ */
+function oa_messages_comment_insert($comment) {
+  $types = oa_core_list_content_types(TRUE);
+  $node = node_load($comment->nid);
+  if (!array_key_exists($node->type, $types)) {
+    // only create messages for node types we care about
+    return;
+  }
+  $message = oa_messages_create('oa_comment', $comment->nid, 'node', '', $comment->cid);
+}
+
+/**
  * Helper function to handle OG Membership messages
  */
 function oa_messages_og_membership_prepare($og_membership, $action, $add_type = TRUE) {
@@ -314,6 +327,10 @@ function oa_messages_oa_messages_create_alter(&$wrapper, $context) {
       }
       break;
 
+    case 'oa_comment':
+      $wrapper->field_oa_comment_ref = $context['arguments'];
+      break;
+
     case 'oa_member':
       $wrapper->field_oa_message_space = $context['arguments'];
       break;
diff --git a/modules/oa_messages/oa_messages.strongarm.inc b/modules/oa_messages/oa_messages.strongarm.inc
index 9784a39..0e9fa8b 100644
--- a/modules/oa_messages/oa_messages.strongarm.inc
+++ b/modules/oa_messages/oa_messages.strongarm.inc
@@ -13,6 +13,166 @@ function oa_messages_strongarm() {
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_message__oa_comment';
+  $strongarm->value = array(
+    'view_modes' => array(
+      'message_notify_email_subject' => array(
+        'custom_settings' => TRUE,
+      ),
+      'message_notify_email_body' => array(
+        'custom_settings' => TRUE,
+      ),
+      'oa_river_header' => array(
+        'custom_settings' => TRUE,
+      ),
+      'oa_river_accordian' => array(
+        'custom_settings' => TRUE,
+      ),
+      'oa_river_body' => array(
+        'custom_settings' => TRUE,
+      ),
+      'full' => array(
+        'custom_settings' => FALSE,
+      ),
+      'ical' => array(
+        'custom_settings' => FALSE,
+      ),
+      'diff_standard' => array(
+        'custom_settings' => FALSE,
+      ),
+      'token' => array(
+        'custom_settings' => FALSE,
+      ),
+    ),
+    'extra_fields' => array(
+      'form' => array(),
+      'display' => array(
+        'message__message_text__0' => array(
+          'message_notify_email_subject' => array(
+            'weight' => '0',
+            'visible' => TRUE,
+          ),
+          'message_notify_email_body' => array(
+            'weight' => '3',
+            'visible' => FALSE,
+          ),
+          'default' => array(
+            'weight' => '1',
+            'visible' => TRUE,
+          ),
+          'oa_river_header' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+          'oa_river_accordian' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+          'oa_river_body' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+        ),
+        'message__message_text__1' => array(
+          'message_notify_email_subject' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_body' => array(
+            'weight' => '0',
+            'visible' => TRUE,
+          ),
+          'default' => array(
+            'weight' => '3',
+            'visible' => TRUE,
+          ),
+          'oa_river_header' => array(
+            'weight' => '3',
+            'visible' => FALSE,
+          ),
+          'oa_river_accordian' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+          'oa_river_body' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+        ),
+        'message__message_text__2' => array(
+          'oa_river_header' => array(
+            'weight' => '0',
+            'visible' => TRUE,
+          ),
+          'oa_river_accordian' => array(
+            'weight' => '3',
+            'visible' => FALSE,
+          ),
+          'oa_river_body' => array(
+            'weight' => '3',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_subject' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_body' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+        ),
+        'message__message_text__3' => array(
+          'oa_river_header' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'oa_river_accordian' => array(
+            'weight' => '0',
+            'visible' => TRUE,
+          ),
+          'oa_river_body' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_subject' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_body' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+        ),
+        'message__message_text__4' => array(
+          'oa_river_header' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+          'oa_river_accordian' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'oa_river_body' => array(
+            'weight' => '0',
+            'visible' => TRUE,
+          ),
+          'message_notify_email_subject' => array(
+            'weight' => '3',
+            'visible' => FALSE,
+          ),
+          'message_notify_email_body' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+        ),
+      ),
+    ),
+  );
+  $export['field_bundle_settings_message__oa_comment'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'field_bundle_settings_message__oa_create';
   $strongarm->value = array(
     'view_modes' => array(),